diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 11:01:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 11:01:13 +0000 |
| commit | 1c08c265487d696b92979c8890470efe0cbfa95c (patch) | |
| tree | 013b8931ec94271db465014cb9b263378a6e14db /sc/inc/externalrefmgr.hxx | |
| parent | #i10000# Correct typo: it's 'oox', not 'ocx'. (diff) | |
| download | core-1c08c265487d696b92979c8890470efe0cbfa95c.tar.gz core-1c08c265487d696b92979c8890470efe0cbfa95c.zip | |
#i10000#: fix merge conflicts (CWS frmdlg)
Diffstat (limited to 'sc/inc/externalrefmgr.hxx')
| -rw-r--r-- | sc/inc/externalrefmgr.hxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 859a916e07e2..664c0afebda5 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -45,8 +45,13 @@ #include <boost/shared_ptr.hpp> #include <vector> #include <list> +#include <formula/ExternalReferenceHelper.hxx> class ScDocument; +namespace formula +{ + class FormulaToken; +} class ScToken; class ScMatrix; class ScTokenArray; @@ -88,8 +93,8 @@ private: class ScExternalRefCache { public: - typedef ::boost::shared_ptr<ScToken> TokenRef; - typedef ::boost::shared_ptr<ScTokenArray> TokenArrayRef; + typedef ::boost::shared_ptr< formula::FormulaToken> TokenRef; + typedef ::boost::shared_ptr<ScTokenArray> TokenArrayRef; struct TableName { @@ -252,7 +257,7 @@ private: // ============================================================================ -class ScExternalRefManager +class ScExternalRefManager : public formula::ExternalReferenceHelper { public: @@ -337,7 +342,7 @@ public: explicit ScExternalRefManager(ScDocument* pDoc); ~ScExternalRefManager(); - String getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const; + virtual String getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const; /** * Get a cache table instance for specified table and table index. Unlike |