[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Wang Lei]

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

New commits:
commit 0f79e6fded66af9d33350864efa4d8c1109b41e1
Author: Wang Lei <leiw at apache.org>
Date:   Thu Jun 14 05:38:10 2012 +0000

    i#119972 - Formula GETPIVOTDATA returns #REF! value
    
    Patch by: pengyunquan
    Review by: Wang Lei
    
    Changed SC_UNO_LAYOUTNAME to SC_UNO_DP_LAYOUTNAME to make it compile.
    (erAck)
    
    (cherry picked from commit 166db0df90f1a5443c6914f48848891fa8016782)
    
    Change-Id: I109885d5b2dfbb95207699a7f28741bd347e850b
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index be2518c..d78f83e 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1292,6 +1292,23 @@ void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, s
                     rtl::OUString aSourceName;
                     rtl::OUString aGivenName;
                     ScDPOutput::GetDataDimensionNames( aSourceName, aGivenName, xDim );
+                    try
+                    {
+                        uno::Any aValue = xDimProp->getPropertyValue(
+                                rtl::OUString::createFromAscii(SC_UNO_DP_LAYOUTNAME) );
+
+                        if( aValue.hasValue() )
+                        {
+                            OUString strLayoutName;
+
+                            if( aValue >>= strLayoutName )
+                                if ( strLayoutName.getLength() > 0 )
+                                    aGivenName = strLayoutName;
+                        }
+                    }
+                    catch(uno::Exception&)
+                    {
+                    }
                     rDataNames.push_back( aSourceName );
                     rGivenNames.push_back( aGivenName );