[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/dpcache.cxx    |    9 ++++++---
 sc/source/ui/docshell/dbdocfun.cxx |    6 ------
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 257a5fb833c2c03a3a82b19b9ab5a7cb3b5848ef
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Aug 22 14:55:34 2012 -0400

    Don't clear the database data cache here.
    
    This would result in the pivot cache being refreshed twice.  This block
    of code was a leftover from the previous, non-cached version of pivot
    table, and this logic no longer applies today.
    
    In today's pivot table code, the cache gets refreshed first, then the
    table gets refreshed afterward.  We should never clear the cache data
    during table refresh.
    
    Change-Id: Ida6fa1805463facf842cb9ea94f4c1afab716595
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index ee642c7..4cb5620 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1329,12 +1329,6 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
             }
             if ( pDestObj )
             {
-                // create new database connection for "refresh"
-                // (and re-read column entry collections)
-                // so all changes take effect
-                if ( pNewObj == pOldObj && pDestObj->IsImportData() )
-                    pDestObj->ClearTableData();
-
                 pDestObj->ReloadGroupTableData();
                 pDestObj->InvalidateData();             // before getting the new output area
 
commit a28d9cad672739cbf8dc6cf1f9db7d0f8becfee1
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Aug 22 14:25:01 2012 -0400

    fdo#53640: Correctly cache source data coming from database backend.
    
    It was due to a simple misplacement of nRow = 0.  Each record was
    labeled row 0.  No wonder it screws up the result badly.
    
    Change-Id: Ia94f42a62f98a9bd7c9d34df3606351bb487931b
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 3299ba0..a11db55 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -461,24 +461,27 @@ bool ScDPCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowSet, const
         Reference<sdbc::XRow> xRow(xRowSet, UNO_QUERY_THROW);
 
         std::vector<Bucket> aBuckets;
+        ScDPItemData aData;
         for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol)
         {
             xRowSet->first();
-            ScDPItemData aData;
             aBuckets.clear();
             Field& rField = maFields[nCol];
+            SCROW nRow = 0;
             do
             {
-                SCROW nRow = 0;
                 short nFormatType = NUMBERFORMAT_UNDEFINED;
+                aData.SetEmpty();
                 getItemValue(*this, aData, xRow, aColTypes[nCol], nCol+1, rNullDate, nFormatType);
-                aBuckets.push_back(Bucket(aData, 0, nRow++));
+                aBuckets.push_back(Bucket(aData, 0, nRow));
                 if (!aData.IsEmpty())
                 {
                     maEmptyRows.insert_back(nRow, nRow+1, false);
                     SvNumberFormatter* pFormatter = mpDoc->GetFormatTable();
                     rField.mnNumFormat = pFormatter ? pFormatter->GetStandardFormat(nFormatType) : 0;
                 }
+
+                ++nRow;
             }
             while (xRowSet->next());