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/token.hxx | |
| parent | fa9f4faf3a00db816a79302001003f6ad47c93e1 (diff) | |
#i10000#: fix merge conflicts (CWS frmdlg)
Diffstat (limited to 'sc/inc/token.hxx')
| -rw-r--r-- | sc/inc/token.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index 6413c8a77992..f9fdba19ade2 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -194,7 +194,7 @@ public: virtual const String& GetString() const; virtual const ScSingleRefData& GetSingleRef() const; virtual ScSingleRefData& GetSingleRef(); - virtual BOOL operator==( const ScToken& rToken ) const; + virtual BOOL operator==( const formula::FormulaToken& rToken ) const; }; @@ -219,7 +219,7 @@ public: virtual ScSingleRefData& GetSingleRef2(); virtual const ScComplexRefData& GetDoubleRef() const; virtual ScComplexRefData& GetDoubleRef(); - virtual BOOL operator==( const ScToken& rToken ) const; + virtual BOOL operator==( const formula::FormulaToken& rToken ) const; }; @@ -236,7 +236,7 @@ public: virtual ~ScExternalNameToken(); virtual USHORT GetIndex() const; virtual const String& GetString() const; - virtual BOOL operator==( const ScToken& rToken ) const; + virtual BOOL operator==( const formula::FormulaToken& rToken ) const; }; |