[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/core/data/dpobject.cxx   |    3 +++
 sc/source/ui/docshell/dbdocfun.cxx |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 76e533a5c6a54ffbbb98880d966e5b060e9626b6
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Mar 22 22:38:56 2012 -0400

    More bug fixes related to grouped dimension handling.

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 2f0e510..9e7af6d 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -564,6 +564,9 @@ void ScDPObject::ReloadGroupTableData()
         // No dimension data. Most likey it doesn't have any group dimensions.
         return;
 
+    if (!mpTableData)
+        return;
+
     ScDPGroupTableData* pData = dynamic_cast<ScDPGroupTableData*>(mpTableData.get());
     if (pData)
     {
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index afb3513..6339e5f 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1328,7 +1328,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                     pDestObj->ClearTableData();
 
                 if (pDestObj->HasGroups())
-                    pDestObj->ClearTableData();
+                    pDestObj->ReloadGroupTableData();
 
                 pDestObj->InvalidateData();             // before getting the new output area