diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 09:31:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 11:44:56 +0000 |
| commit | 8de63ad5bb2a60f7306a9bfe15384cd0164109df (patch) | |
| tree | 6f1f5947a1ddc1cc1a883cb8c21afee8fc582124 /include/formula | |
| parent | 0f46d90621eb5af6548ec6e9933b3a041728bd4e (diff) | |
some more de-boostification
Change-Id: I8ee8fd7b99598e484430d91e17e468951288d72d
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/FormulaCompiler.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index ace9f3b383e3..0758ddaa479d 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -25,9 +25,6 @@ #include <rtl/ustring.hxx> #include <tools/debug.hxx> -#include <boost/shared_ptr.hpp> -#include <boost/noncopyable.hpp> - #include <com/sun/star/uno/Sequence.hxx> #include <formula/opcode.hxx> @@ -35,6 +32,7 @@ #include <formula/token.hxx> #include <formula/ExternalReferenceHelper.hxx> +#include <memory> #include <unordered_map> #define FORMULA_MAXJUMPCOUNT 32 /* maximum number of jumps (ocChoose) */ @@ -64,8 +62,11 @@ struct FormulaArrayStack typedef std::unordered_map< OUString, OpCode, OUStringHash, ::std::equal_to< OUString > > OpCodeHashMap; typedef std::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > ExternalHashMap; -class FORMULA_DLLPUBLIC FormulaCompiler : boost::noncopyable +class FORMULA_DLLPUBLIC FormulaCompiler { +private: + FormulaCompiler(const FormulaCompiler&) SAL_DELETED_FUNCTION; + FormulaCompiler& operator=(const FormulaCompiler&) SAL_DELETED_FUNCTION; public: FormulaCompiler(); FormulaCompiler(FormulaTokenArray& _rArr); @@ -191,8 +192,8 @@ public: }; public: - typedef ::boost::shared_ptr< const OpCodeMap > OpCodeMapPtr; - typedef ::boost::shared_ptr< OpCodeMap > NonConstOpCodeMapPtr; + typedef std::shared_ptr< const OpCodeMap > OpCodeMapPtr; + typedef std::shared_ptr< OpCodeMap > NonConstOpCodeMapPtr; /** Get OpCodeMap for formula language. @param nLanguage |