diff options
-rw-r--r-- | formula/source/ui/inc/ModuleHelper.hxx | 3 | ||||
-rw-r--r-- | include/formula/FormulaCompiler.hxx | 10 | ||||
-rw-r--r-- | include/formula/token.hxx | 4 |
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 |