diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-12-14 00:31:34 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-12-14 00:31:34 -0500 |
| commit | 681e8b1e43c1949871463934fa92396c00110270 (patch) | |
| tree | 3a7f5ac8e95339dc56960f223ee845ccf28035af | |
| parent | 7352c717a307c46f0f1825375597fbe44b816ba5 (diff) | |
fdo#39118: Fixed chart listener registration during ODS import.
The breakage was due to the drawing layer re-work. We do need to store
charts (or all OLE shapes with associated listening ranges) for later
registration regardless of anchor types.
| -rw-r--r-- | sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xml/XMLTableShapeResizer.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 7568b226d9d0..e2b121672ec5 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -154,7 +154,7 @@ void XMLTableShapeImportHelper::finishShape( } } - if ( bOnTable && pRangeList ) + if (pRangeList) { // #i78086# If there are notification ranges, the ChartListener must be created // also when anchored to the sheet diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 9a53b78fccb8..2007b789b3bf 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -79,6 +79,7 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, } OUString aRangeStr; + // This one returns ranges with ';' as the separators. ScRangeStringConverter::GetStringFromXMLRangeString(aRangeStr, rRangeList, pDoc); if (!aRangeStr.getLength()) { @@ -95,9 +96,8 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, SAL_WNODEPRECATED_DECLARATIONS_PUSH auto_ptr< vector<ScTokenRef> > pRefTokens(new vector<ScTokenRef>); SAL_WNODEPRECATED_DECLARATIONS_POP - const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); ScRefTokenHelper::compileRangeRepresentation( - *pRefTokens, aRangeStr, pDoc, cSep, formula::FormulaGrammar::GRAM_ENGLISH); + *pRefTokens, aRangeStr, pDoc, ';', formula::FormulaGrammar::GRAM_ENGLISH); if (!pRefTokens->empty()) { ScChartListener* pCL(new ScChartListener(rName, pDoc, pRefTokens.release())); |