diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-09-17 06:37:02 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-09-17 06:38:58 +0200 |
| commit | 94782edef386a9e32842d3caba39e69a04760248 (patch) | |
| tree | 2a35462141f3caf22009abd04c87dfe17d35de0d | |
| parent | tdf#101359 Just advance list box for BOOKMARKs (diff) | |
| download | core-94782edef386a9e32842d3caba39e69a04760248.tar.gz core-94782edef386a9e32842d3caba39e69a04760248.zip | |
Fix build with DEBUG_PIVOT_TABLE macro
Change-Id: Ia2e38469ab8df268c6e03d77cae76e16e454ad76
| -rw-r--r-- | sc/source/core/data/dpcache.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/data/dpobject.cxx | 8 | ||||
| -rw-r--r-- | sc/source/core/data/pivot2.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 655a46093a37..85de53846244 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -1281,7 +1281,7 @@ void ScDPCache::Dump() const FieldsType::const_iterator it = maFields.begin(), itEnd = maFields.end(); for (size_t i = 0; it != itEnd; ++it, ++i) { - const Field& fld = *it; + const Field& fld = *(*it); cout << "* source dimension: " << GetDimensionName(i) << " (ID = " << i << ")" << endl; cout << " item count: " << fld.maItems.size() << endl; if (bDumpItems) @@ -1306,7 +1306,7 @@ void ScDPCache::Dump() const GroupFieldsType::const_iterator it = maGroupFields.begin(), itEnd = maGroupFields.end(); for (size_t i = maFields.size(); it != itEnd; ++it, ++i) { - const GroupItems& gi = *it; + const GroupItems& gi = *(*it); cout << "* group dimension: (unnamed) (ID = " << i << ")" << endl; cout << " item count: " << gi.maItems.size() << endl; cout << " group type: " << getGroupTypeName(gi.mnGroupType) << endl; diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 733ff90a535b..4ba4398aae69 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -3778,12 +3778,12 @@ bool ScDPCollection::HasTable( const ScRange& rRange ) const namespace { -struct DumpTable : std::unary_function<ScDPObject, void> +struct DumpTable : std::unary_function<std::unique_ptr<ScDPObject>, void> { - void operator() (const ScDPObject& rObj) const + void operator() (const std::unique_ptr<ScDPObject>& rObj) const { - cout << "-- '" << rObj.GetName() << "'" << endl; - ScDPSaveData* pSaveData = rObj.GetSaveData(); + cout << "-- '" << rObj->GetName() << "'" << endl; + ScDPSaveData* pSaveData = rObj->GetSaveData(); if (!pSaveData) return; diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx index cbb6f838b1ec..ddfebafdab57 100644 --- a/sc/source/core/data/pivot2.cxx +++ b/sc/source/core/data/pivot2.cxx @@ -182,7 +182,7 @@ ScPivotFuncData::ScPivotFuncData( SCCOL nCol, PivotFunc nFuncMask ) : void ScPivotFuncData::Dump() const { cout << "ScPivotFuncData: (col=" << mnCol << ", original dim=" << mnOriginalDim - << ", func mask=" << mnFuncMask << ", duplicate count=" << static_cast<int>(mnDupCount) + << ", func mask=" << static_cast<int>(mnFuncMask) << ", duplicate count=" << static_cast<int>(mnDupCount) << ")" << endl; } #endif |