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

[Tamás Zolnai]

 sc/source/core/data/dpcache.cxx  |    4 ++--
 sc/source/core/data/dpobject.cxx |    8 ++++----
 sc/source/core/data/pivot2.cxx   |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 94782edef386a9e32842d3caba39e69a04760248
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Sat Sep 17 06:37:02 2016 +0200

    Fix build with DEBUG_PIVOT_TABLE macro
    
    Change-Id: Ia2e38469ab8df268c6e03d77cae76e16e454ad76

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 655a460..85de538 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 733ff90..4ba4398 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 cbb6f83..ddfebaf 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