mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#103530 OOXML: pass ExternalLinkInfo compiling named expressions

Browse Source 
Change-Id: If15aa520b93f30b889e5f950185068ef3bdb9235
This commit is contained in:
Eike Rathke
2016-10-27 12:06:46 +02:00
parent d12c7aee5c
commit e641c1740f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sc/source/filter/inc/defnamesbuffer.hxx
View File

@@ -99,8 +99,8 @@ public:
/** Creates a defined name in the Calc document. */ /** Creates a defined name in the Calc document. */
void createNameObject( sal_Int32 nIndex ); void createNameObject( sal_Int32 nIndex );
/** Converts the formula string or BIFF token array for this defined name. */ /** Converts the formula string or BIFF token array for this defined name. */
void convertFormula(); void convertFormula( const css::uno::Sequence<css::sheet::ExternalLinkInfo>& rExternalLinks );
std::unique_ptr<ScTokenArray> getScTokens(); std::unique_ptr<ScTokenArray> getScTokens( const css::uno::Sequence<css::sheet::ExternalLinkInfo>& rExternalLinks );
/** Returns true, if this defined name is global in the document. */ /** Returns true, if this defined name is global in the document. */
inline bool isGlobalName() const { return mnCalcSheet < 0; } inline bool isGlobalName() const { return mnCalcSheet < 0; }
/** Returns true, if this defined name is a special builtin name. */ /** Returns true, if this defined name is a special builtin name. */

10
sc/source/filter/oox/defnamesbuffer.cxx
View File

@@ -322,11 +322,13 @@ void DefinedName::createNameObject( sal_Int32 nIndex )
mnTokenIndex = nIndex; mnTokenIndex = nIndex;
} }
std::unique_ptr<ScTokenArray> DefinedName::getScTokens() std::unique_ptr<ScTokenArray> DefinedName::getScTokens(
const css::uno::Sequence<css::sheet::ExternalLinkInfo>& rExternalLinks )
{ {
ScTokenArray aTokenArray; ScTokenArray aTokenArray;
ScCompiler aCompiler(&getScDocument(), ScAddress(0, 0, mnCalcSheet)); ScCompiler aCompiler(&getScDocument(), ScAddress(0, 0, mnCalcSheet));
aCompiler.SetGrammar(formula::FormulaGrammar::GRAM_OOXML); aCompiler.SetGrammar(formula::FormulaGrammar::GRAM_OOXML);
aCompiler.SetExternalLinks( rExternalLinks);
std::unique_ptr<ScTokenArray> pArray(aCompiler.CompileString(maModel.maFormula)); std::unique_ptr<ScTokenArray> pArray(aCompiler.CompileString(maModel.maFormula));
// Compile the tokens into RPN once to populate information into tokens // Compile the tokens into RPN once to populate information into tokens
// where necessary, e.g. for TableRef inner reference. RPN can be discarded // where necessary, e.g. for TableRef inner reference. RPN can be discarded
@@ -339,7 +341,7 @@ std::unique_ptr<ScTokenArray> DefinedName::getScTokens()
return pArray; return pArray;
} }
void DefinedName::convertFormula() void DefinedName::convertFormula( const css::uno::Sequence<css::sheet::ExternalLinkInfo>& rExternalLinks )
{ {
// macro function or vba procedure // macro function or vba procedure
if(!mpScRangeData) if(!mpScRangeData)
@@ -347,7 +349,7 @@ void DefinedName::convertFormula()
// convert and set formula of the defined name // convert and set formula of the defined name
{ {
std::unique_ptr<ScTokenArray> pTokenArray = getScTokens(); std::unique_ptr<ScTokenArray> pTokenArray = getScTokens( rExternalLinks);
mpScRangeData->SetCode( *pTokenArray ); mpScRangeData->SetCode( *pTokenArray );
} }
@@ -445,7 +447,7 @@ void DefinedNamesBuffer::finalizeImport()
/* Now convert all name formulas, so that the formula parser can find all /* Now convert all name formulas, so that the formula parser can find all
names in case of circular dependencies. */ names in case of circular dependencies. */
maDefNames.forEachMem( &DefinedName::convertFormula ); maDefNames.forEachMem( &DefinedName::convertFormula, getExternalLinks().getLinkInfos());
} }
DefinedNameRef DefinedNamesBuffer::getByIndex( sal_Int32 nIndex ) const DefinedNameRef DefinedNamesBuffer::getByIndex( sal_Int32 nIndex ) const