diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-22 14:44:41 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-23 09:30:08 +0200 |
commit | 512ed170fe6c345fbb882c23e40ee9e884ff2f28 (patch) | |
tree | eb03a42c7cc28222c34632d04ac125e6a9f40987 /sc/inc/token.hxx | |
parent | 1ba2028ab93a649ddab9b7253ea7ef7e7cf6d40f (diff) |
Turn static ScToken::ExtendRangeReference into free function
...and rename to extendRangeReference to avoid confusion with
formula::FormulaCompiler::ExtendRangeReference.
Change-Id: Ifcad309c14e04a0e37c80ca44462da587387241d
Diffstat (limited to 'sc/inc/token.hxx')
-rw-r--r-- | sc/inc/token.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index 7ce60e231620..fd8c8844b38c 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -93,22 +93,22 @@ public: #if DEBUG_FORMULA_COMPILER virtual void Dump() const; #endif - - /** If rTok1 and rTok2 both are SingleRef or DoubleRef tokens, extend/merge - ranges as needed for ocRange. - @param rPos - The formula's position, used to calculate absolute positions from - relative references. - @param bReuseDoubleRef - If true, a DoubleRef token is reused if passed as rTok1 or rTok2, - else a new DoubleRef token is created and returned. - @return - A reused or new'ed ScDoubleRefToken, or a NULL TokenRef if rTok1 or - rTok2 are not of sv(Single|Double)Ref - */ - static formula::FormulaTokenRef ExtendRangeReference( formula::FormulaToken & rTok1, formula::FormulaToken & rTok2, const ScAddress & rPos, bool bReuseDoubleRef ); }; +/** If rTok1 and rTok2 both are SingleRef or DoubleRef tokens, extend/merge + ranges as needed for ocRange. + @param rPos + The formula's position, used to calculate absolute positions from + relative references. + @param bReuseDoubleRef + If true, a DoubleRef token is reused if passed as rTok1 or rTok2, + else a new DoubleRef token is created and returned. + @return + A reused or new'ed ScDoubleRefToken, or a NULL TokenRef if rTok1 or + rTok2 are not of sv(Single|Double)Ref +*/ +formula::FormulaTokenRef extendRangeReference( formula::FormulaToken & rTok1, formula::FormulaToken & rTok2, const ScAddress & rPos, bool bReuseDoubleRef ); + inline void intrusive_ptr_add_ref(const ScToken* p) { p->IncRef(); |