[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/core/data/dpobject.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f1a2c10b72a87a3826861562430fc80e3ffd6048
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Mon Mar 19 19:12:57 2012 -0400

    Fix a crash on launching the pivot layout dialog with duplicated data fields.

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 6348b7f..9da61d1 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2058,6 +2058,9 @@ bool ScDPObject::FillLabelDataForDimension(
         rLabelData.mnOriginalDim = static_cast<long>(nOrigPos);
         rLabelData.maLayoutName = aLayoutName;
         rLabelData.maSubtotalName = aSubtotalName;
+        if (nOrigPos >= 0)
+            // This is a duplicated dimension. Use the original dimension index.
+            nDim = nOrigPos;
         GetHierarchies(nDim, rLabelData.maHiers);
         GetMembers(nDim, GetUsedHierarchy(nDim), rLabelData.maMembers);
         lcl_FillLabelData(rLabelData, xDimProp);