summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-16 10:11:04 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-12 22:06:19 -0400
commit2d2ae27b7e7aa147351655a40ed324b67cecf828 (patch)
treeeb52bec1a946d147e3e8b9f3d5db6e250d533f85 /formula
parentc5cdfe39d3afca716e7b11f8f8e169ce378861ea (diff)
update unusedmethods plugin to deal with constructors
and fix the operator< implementations in some of the other plugins too. Reviewed-on: https://gerrit.libreoffice.org/25057 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> (cherry picked from commit 2c8fe2e737b84ecd3dbac36a4fe6bd061bbd3bae) Change-Id: Ie5631e0cdc8d2a994ad2af2533cdb558a6cfc035
Diffstat (limited to 'formula')
-rw-r--r--formula/source/core/api/token.cxx17
-rw-r--r--formula/source/core/inc/core_resource.hxx2
2 files changed, 1 insertions, 18 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 6cb89717e057..ca9928fb748b 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1818,23 +1818,6 @@ bool FormulaMissingToken::operator==( const FormulaToken& r ) const
}
-FormulaSubroutineToken::FormulaSubroutineToken( const FormulaSubroutineToken& r ) :
- FormulaToken( r ),
- mpArray( r.mpArray->Clone())
-{
-}
-FormulaSubroutineToken::~FormulaSubroutineToken()
-{
- delete mpArray;
-}
-bool FormulaSubroutineToken::operator==( const FormulaToken& r ) const
-{
- // Arrays don't equal..
- return FormulaToken::operator==( r ) &&
- (mpArray == static_cast<const FormulaSubroutineToken&>(r).mpArray);
-}
-
-
bool FormulaUnknownToken::operator==( const FormulaToken& r ) const
{
return FormulaToken::operator==( r );
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
index 79ec9f89bf8f..51989f2170e5 100644
--- a/formula/source/core/inc/core_resource.hxx
+++ b/formula/source/core/inc/core_resource.hxx
@@ -39,7 +39,7 @@ namespace formula
private:
// no instantiation allowed
- ResourceManager() { }
+ ResourceManager() = delete;
~ResourceManager() { }
protected: