summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-02-07 12:15:04 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-02-07 12:35:59 +0100
commit3f56e6551b41a8a4768f975b36208b1a4fdb3328 (patch)
treecf201aac612871939593e046b76dd5f5b57ef02b
parent73e117d19a67c2a1ed2fa28aaee36f42759f0755 (diff)
loplugin:deletedspecial
Change-Id: Id13844313c63552bec4f9ae7333a14948b386f03
-rw-r--r--formula/source/ui/inc/ModuleHelper.hxx3
-rw-r--r--include/formula/FormulaCompiler.hxx10
-rw-r--r--include/formula/token.hxx4
3 files changed, 6 insertions, 11 deletions
diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx
index 40278d9f4bdb..70e292311684 100644
--- a/formula/source/ui/inc/ModuleHelper.hxx
+++ b/formula/source/ui/inc/ModuleHelper.hxx
@@ -36,8 +36,7 @@ namespace formula
friend class OModuleClient;
private:
- OModule();
- // not implemented. OModule is a static class
+ OModule() SAL_DELETED_FUNCTION; //TODO: get rid of this class
protected:
static sal_Int32 s_nClients; /// number of registered clients
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index 0d959c69fdca..ace9f3b383e3 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -83,9 +83,8 @@ public:
bool mbCore : 1; /// If mapping was setup by core, not filters
bool mbEnglish : 1; /// If English symbols and external names
- OpCodeMap(); // prevent usage
- OpCodeMap( const OpCodeMap& ); // prevent usage
- OpCodeMap& operator=( const OpCodeMap& ); // prevent usage
+ OpCodeMap( const OpCodeMap& ) SAL_DELETED_FUNCTION;
+ OpCodeMap& operator=( const OpCodeMap& ) SAL_DELETED_FUNCTION;
public:
@@ -362,9 +361,8 @@ private:
{
FormulaTokenRef pPrevFac;
FormulaCompiler* pCompiler;
- // not implemented
- CurrentFactor( const CurrentFactor& );
- CurrentFactor& operator=( const CurrentFactor& );
+ CurrentFactor( const CurrentFactor& ) SAL_DELETED_FUNCTION;
+ CurrentFactor& operator=( const CurrentFactor& ) SAL_DELETED_FUNCTION;
public:
explicit CurrentFactor( FormulaCompiler* pComp )
: pPrevFac( pComp->pCurrentFactorToken )
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 3e2743e17cd1..6d6550b5df72 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -94,9 +94,7 @@ class FormulaTokenArray;
class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
{
OpCode eOp;
- // not implemented, prevent usage
- FormulaToken();
- FormulaToken& operator=( const FormulaToken& );
+ FormulaToken& operator=( const FormulaToken& ) SAL_DELETED_FUNCTION;
protected:
const StackVar eType; // type of data