Kaydet (Commit) 757ce63f authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard

remove copy&paste code

Change-Id: I5710856fdb9fb91573de89eeb5a29d3d106ad7a6
üst 02caf8f2
...@@ -986,6 +986,10 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 ...@@ -986,6 +986,10 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1
struct ConventionXL struct ConventionXL
{ {
virtual ~ConventionXL()
{
}
static void GetTab( static void GetTab(
const ScAddress& rPos, const std::vector<OUString>& rTabNames, const ScAddress& rPos, const std::vector<OUString>& rTabNames,
const ScSingleRefData& rRef, OUString& rTabName ) const ScSingleRefData& rRef, OUString& rTabName )
...@@ -1100,7 +1104,7 @@ struct ConventionXL ...@@ -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(); sal_Int32 nLen = rFormula.getLength();
const sal_Unicode* p = rFormula.getStr(); const sal_Unicode* p = rFormula.getStr();
...@@ -1236,7 +1240,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL ...@@ -1236,7 +1240,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
sal_Int32 nSrcPos, sal_Int32 nSrcPos,
const CharClass* pCharClass) const SAL_OVERRIDE const CharClass* pCharClass) const SAL_OVERRIDE
{ {
ConventionXL::parseExternalDocName(rFormula, nSrcPos); parseExternalDocName(rFormula, nSrcPos);
ParseResult aRet; ParseResult aRet;
if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) ) if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) )
...@@ -1322,7 +1326,7 @@ struct ConventionXL_OOX : public ConventionXL_A1 ...@@ -1322,7 +1326,7 @@ struct ConventionXL_OOX : public ConventionXL_A1
* CellStr. */ * 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(); sal_Int32 nLen = rFormula.getLength();
const sal_Unicode* p = rFormula.getStr(); const sal_Unicode* p = rFormula.getStr();
...@@ -1343,25 +1347,6 @@ struct ConventionXL_OOX : public ConventionXL_A1 ...@@ -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( virtual void makeExternalRefStr(
OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& /*rFileName*/, OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& /*rFileName*/,
const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE
...@@ -1501,7 +1486,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL ...@@ -1501,7 +1486,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
sal_Int32 nSrcPos, sal_Int32 nSrcPos,
const CharClass* pCharClass) const SAL_OVERRIDE const CharClass* pCharClass) const SAL_OVERRIDE
{ {
ConventionXL::parseExternalDocName(rFormula, nSrcPos); parseExternalDocName(rFormula, nSrcPos);
ParseResult aRet; ParseResult aRet;
if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) ) if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) )
......
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