diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-12-21 18:03:28 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-12-21 18:03:28 -0500 |
| commit | 579e5624fa3740ff79d99607bffabc9ba2d80c1b (patch) | |
| tree | 7546ccc3d1347842e66c140ce14e89fee71a884b /sc/inc/reftokenhelper.hxx | |
| parent | db373021b452bddf179eaf268957033bd23ae715 (diff) | |
Removed ScSharedTokenRef and replaced it with ScTokenRef.
ScSharedTokenRef was implemented by boost::shared_ptr, only because
SimpleIntrusiveReference which the original ScTokenRef was implemented
by could not be used with STL.
Now that ScTokenRef is implemented by intrusive_ptr, we no longer
need ScSharedTokenRef.
Diffstat (limited to 'sc/inc/reftokenhelper.hxx')
| -rw-r--r-- | sc/inc/reftokenhelper.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx index 90c7fb695ca1..36d28f156780 100644 --- a/sc/inc/reftokenhelper.hxx +++ b/sc/inc/reftokenhelper.hxx @@ -54,31 +54,31 @@ public: * The source range may consist of multiple ranges separated by ';'s. */ static void compileRangeRepresentation( - ::std::vector<ScSharedTokenRef>& rRefTokens, const ::rtl::OUString& rRangeStr, ScDocument* pDoc, + ::std::vector<ScTokenRef>& rRefTokens, const ::rtl::OUString& rRangeStr, ScDocument* pDoc, ::formula::FormulaGrammar::Grammar eGrammar = ::formula::FormulaGrammar::GRAM_ENGLISH); - static bool getRangeFromToken(ScRange& rRange, const ScSharedTokenRef& pToken, bool bExternal = false); + static bool getRangeFromToken(ScRange& rRange, const ScTokenRef& pToken, bool bExternal = false); - static void getRangeListFromTokens(ScRangeList& rRangeList, const ::std::vector<ScSharedTokenRef>& pTokens); + static void getRangeListFromTokens(ScRangeList& rRangeList, const ::std::vector<ScTokenRef>& pTokens); /** * Create a double reference token from a range object. */ - static void getTokenFromRange(ScSharedTokenRef& pToken, const ScRange& rRange); + static void getTokenFromRange(ScTokenRef& pToken, const ScRange& rRange); - static void getTokensFromRangeList(::std::vector<ScSharedTokenRef>& pTokens, const ScRangeList& rRanges); + static void getTokensFromRangeList(::std::vector<ScTokenRef>& pTokens, const ScRangeList& rRanges); - static bool SC_DLLPUBLIC isRef(const ScSharedTokenRef& pToken); - static bool SC_DLLPUBLIC isExternalRef(const ScSharedTokenRef& pToken); + static bool SC_DLLPUBLIC isRef(const ScTokenRef& pToken); + static bool SC_DLLPUBLIC isExternalRef(const ScTokenRef& pToken); - static bool SC_DLLPUBLIC intersects(const ::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken); + static bool SC_DLLPUBLIC intersects(const ::std::vector<ScTokenRef>& rTokens, const ScTokenRef& pToken); - static void SC_DLLPUBLIC join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken); + static void SC_DLLPUBLIC join(::std::vector<ScTokenRef>& rTokens, const ScTokenRef& pToken); - static bool getDoubleRefDataFromToken(ScComplexRefData& rData, const ScSharedTokenRef& pToken); + static bool getDoubleRefDataFromToken(ScComplexRefData& rData, const ScTokenRef& pToken); - static ScSharedTokenRef createRefToken(const ScAddress& rAddr); - static ScSharedTokenRef createRefToken(const ScRange& rRange); + static ScTokenRef createRefToken(const ScAddress& rAddr); + static ScTokenRef createRefToken(const ScRange& rRange); }; #endif |