diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-11-17 16:44:01 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-11-17 16:44:01 -0500 |
| commit | 0bb4da6d7d988d98b466db23fae2061e47226d39 (patch) | |
| tree | 34d4ac0e7d9dccc5db1d746b8906b6d462ccb554 | |
| parent | f417c6cad6608705d674610e99c17170a340f549 (diff) | |
Some innocuous change merged from feature/calc-dp-unlimited-fields.
This will make rebasing of the said branch with master easier.
| -rw-r--r-- | sc/source/core/data/dpobject.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index bd84232b23cf..97c1e9e52c6b 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&) { |