diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-12-27 06:51:52 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-27 07:01:52 +0100 |
| commit | 18cccd62fb5b730319878df6fac748d5cdf73f1f (patch) | |
| tree | c9eeddcc6341c4d3deb9c91c6cf9b801fb2aa55f | |
| parent | 808b0bf831d4a4fdb60c01865d0a7dd36cf9d521 (diff) | |
handle index based external refs in formulas in ooxml import, fdo#85617
Change-Id: Ie4f43f041f5d614b9c2826c74574c854af05c266
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 0c273b3fe5f3..1c292aa28776 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -1322,6 +1322,52 @@ struct ConventionXL_OOX : public ConventionXL_A1 * CellStr. */ } + static void parseExternalDocNameOOX(const OUString& rFormula, sal_Int32& rSrcPos) + { + sal_Int32 nLen = rFormula.getLength(); + const sal_Unicode* p = rFormula.getStr(); + for (sal_Int32 i = rSrcPos; i < nLen; ++i) + { + sal_Unicode c = p[i]; + if (i == rSrcPos) + { + // first character must be '['. + if (c != '[') + return; + } + else if (c == ']') + { + rSrcPos = i + 1; + } + } + } + + virtual ParseResult parseAnyToken( const OUString& rFormula, + sal_Int32 nSrcPos, + const CharClass* pCharClass) const SAL_OVERRIDE + { + parseExternalDocNameOOX(rFormula, nSrcPos); + + ParseResult aRet; + if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) ) + return aRet; + + static const sal_Int32 nStartFlags = KParseTokens::ANY_LETTER_OR_NUMBER | + KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR; + static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT; + // '?' allowed in range names + const OUString aAddAllowed("?!"); + return pCharClass->parseAnyToken( rFormula, + nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); + } + + virtual bool parseExternalName( const OUString& rSymbol, OUString& rFile, OUString& rName, + const ScDocument* pDoc, + const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const SAL_OVERRIDE + { + return ConventionXL::parseExternalName( rSymbol, rFile, rName, pDoc, pExternalLinks); + } + virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& /*rFileName*/, const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE |