[Libreoffice-commits] .: sc/source

Kohei Yoshida kohei at kemper.freedesktop.org
Wed Nov 17 13:52:50 PST 2010


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

New commits:
commit 04c24d3d1c2a76857e3ad943ee8bd9a1603459f5
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Nov 17 16:44:01 2010 -0500

    Some innocuous change merged from feature/calc-dp-unlimited-fields.
    
    This will make rebasing of the said branch with master easier.

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index ef236dd..a3ff5ac 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1756,13 +1756,16 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
             else
                 nMask = lcl_FirstSubTotal( xDimProp );		// from first hierarchy
 
-            BOOL bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
+            // is this data layout dimension?
+            bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty(
+                xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)));
+
+            // is this dimension cloned?
             uno::Any aOrigAny;
             try
             {
                 aOrigAny = xDimProp->getPropertyValue(
-                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIGINAL)) );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIGINAL)));
             }
             catch(uno::Exception&)
             {


More information about the Libreoffice-commits mailing list