Kaydet (Commit) 681e8b1e authored tarafından Kohei Yoshida's avatar Kohei Yoshida

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.
üst 7352c717
......@@ -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
......
......@@ -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()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment