diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-01-23 22:18:05 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-01-23 22:23:02 -0500 |
| commit | 043e30baedb42dbc8799003ea2ae7987a97871ca (patch) | |
| tree | 1236516133e08a5704cbcbc1fffddafb8989be49 /xmloff | |
| parent | b1d0fd4f969976e2133f8eaa37c1fb8360c20f68 (diff) | |
fdo#58562: Ensure internal data is always used when pasting to another doc.
Without this, pasting a chart object from one Calc doc to another may
occasionally incorrectly switch to range references *if* the destination
document contains the "right" set of sheet names. With this fix, pasted
chart objects always switch to internal cached data source when pasting
to another document, while retaining range references when pasting within
the same document.
Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/chart/SchXMLTools.cxx | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index db3a7f8290eb..2e469a4659f1 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -377,14 +377,34 @@ Reference< chart2::data::XDataSequence > CreateDataSequence( return xRet; } - try + bool bUseInternal = false; + uno::Reference<beans::XPropertySet> xPropSet(xDataProvider, uno::UNO_QUERY); + if (xPropSet.is()) { - xRet.set( xDataProvider->createDataSequenceByRangeRepresentation( lcl_ConvertRange( rRange, xDataProvider ))); - SchXMLTools::setXMLRangePropertyAtDataSequence( xRet, rRange ); + try + { + sal_Bool bVal; + uno::Any any = xPropSet->getPropertyValue("UseInternalDataProvider"); + if (any >>= bVal) + bUseInternal = static_cast<bool>(bVal); + } + catch (const beans::UnknownPropertyException&) + { + // Do nothing + } } - catch( const lang::IllegalArgumentException & ) + + if (!bUseInternal) { - OSL_FAIL( "could not create data sequence" ); + try + { + xRet.set( xDataProvider->createDataSequenceByRangeRepresentation( lcl_ConvertRange( rRange, xDataProvider ))); + SchXMLTools::setXMLRangePropertyAtDataSequence( xRet, rRange ); + } + catch( const lang::IllegalArgumentException & ) + { + OSL_FAIL( "could not create data sequence" ); + } } if( !xRet.is() && !xChartDoc->hasInternalDataProvider() && !rRange.isEmpty() ) |