diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-16 10:05:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-18 08:37:57 +0200 |
| commit | 346b900594a84581056ba56061ea513f4e6f101d (patch) | |
| tree | cf617262c91c9b8f94f02b6ada55b6994a70eb9b /include/formula | |
| parent | 2bc84658cce1df5050fe788dd0c8a0906a1ca2c3 (diff) | |
loplugin:mergeclasses merge IFormulaToken into FormulaToken
Change-Id: I5dbf870ff27f1039e24f4350787cf5bfc5f4ccaf
Reviewed-on: https://gerrit.libreoffice.org/57487
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/IFunctionDescription.hxx | 10 | ||||
| -rw-r--r-- | include/formula/token.hxx | 14 |
2 files changed, 2 insertions, 22 deletions
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx index b0211aa2cd88..3d03d4e6c069 100644 --- a/include/formula/IFunctionDescription.hxx +++ b/include/formula/IFunctionDescription.hxx @@ -108,16 +108,6 @@ namespace formula ~IFunctionDescription() {} }; - class SAL_NO_VTABLE IFormulaToken - { - public: - virtual bool isFunction() const = 0; - virtual sal_uInt32 getArgumentCount() const = 0; - - protected: - ~IFormulaToken() {} - }; - class SAL_NO_VTABLE IFormulaEditorHelper { public: diff --git a/include/formula/token.hxx b/include/formula/token.hxx index d464ec67d39e..6d2851e4edfe 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -121,7 +121,7 @@ inline std::string StackVarEnumToString(StackVar const e) return os.str(); } -class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken +class FORMULA_DLLPUBLIC FormulaToken { OpCode eOp; FormulaToken& operator=( const FormulaToken& ) = delete; @@ -139,7 +139,7 @@ public: void Delete() { delete this; } void DeleteIfZeroRef() { if (mnRefCnt == 0) delete this; } StackVar GetType() const { return eType; } - bool IsFunction() const; // pure functions, no operators + bool IsFunction() const; // pure functions, no operators bool IsExternalRef() const; bool IsRef() const; @@ -214,16 +214,6 @@ public: virtual bool TextEqual( const formula::FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const; - virtual bool isFunction() const override - { - return IsFunction(); - } - - virtual sal_uInt32 getArgumentCount() const override - { - return GetParamCount(); - } - /** This is dirty and only the compiler should use it! */ struct PrivateAccess { friend class FormulaCompiler; private: PrivateAccess() { } }; void NewOpCode( OpCode e, const PrivateAccess& ) { eOp = e; } |