diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-12-27 19:27:19 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-27 19:30:19 +0100 |
| commit | 757ce63f7346aea132f11c3d9a328b0a1a776403 (patch) | |
| tree | 50472cf2266c2a7ce57d90afa513ad8369390e86 | |
| parent | 02caf8f2eef75d8b5acb6a4ec40277355c3c6c6e (diff) | |
remove copy&paste code
Change-Id: I5710856fdb9fb91573de89eeb5a29d3d106ad7a6
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 7419a37816b2..f6c868d8c888 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -986,6 +986,10 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 struct ConventionXL { + virtual ~ConventionXL() + { + } + static void GetTab( const ScAddress& rPos, const std::vector<OUString>& rTabNames, const ScSingleRefData& rRef, OUString& rTabName ) @@ -1100,7 +1104,7 @@ struct ConventionXL } } - static void parseExternalDocName( const OUString& rFormula, sal_Int32& rSrcPos ) + virtual void parseExternalDocName( const OUString& rFormula, sal_Int32& rSrcPos ) const { sal_Int32 nLen = rFormula.getLength(); const sal_Unicode* p = rFormula.getStr(); @@ -1236,7 +1240,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL sal_Int32 nSrcPos, const CharClass* pCharClass) const SAL_OVERRIDE { - ConventionXL::parseExternalDocName(rFormula, nSrcPos); + parseExternalDocName(rFormula, nSrcPos); ParseResult aRet; if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) ) @@ -1322,7 +1326,7 @@ struct ConventionXL_OOX : public ConventionXL_A1 * CellStr. */ } - static void parseExternalDocNameOOX(const OUString& rFormula, sal_Int32& rSrcPos) + virtual void parseExternalDocName(const OUString& rFormula, sal_Int32& rSrcPos) const SAL_OVERRIDE { sal_Int32 nLen = rFormula.getLength(); const sal_Unicode* p = rFormula.getStr(); @@ -1343,25 +1347,6 @@ struct ConventionXL_OOX : public ConventionXL_A1 } } - 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 void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& /*rFileName*/, const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE @@ -1501,7 +1486,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL sal_Int32 nSrcPos, const CharClass* pCharClass) const SAL_OVERRIDE { - ConventionXL::parseExternalDocName(rFormula, nSrcPos); + parseExternalDocName(rFormula, nSrcPos); ParseResult aRet; if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) ) |