diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-26 15:46:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-26 15:47:03 +0200 |
| commit | 1df1c5eed9d44130fee818745cbb3d5ee59b7c3f (patch) | |
| tree | ed60ffbc022965f2b2e712bb188e46b64880a1da /sc/source | |
| parent | 296371d5d8f58c46e976f66b11599410d97dc472 (diff) | |
formula: std::auto_ptr -> std::unique_ptr
Change-Id: I7b4784abf5177e22a9df33c5d4faccfd39801b11
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/inc/formula.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/tokenuno.cxx | 6 |
3 files changed, 5 insertions, 13 deletions
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index aca2b706c5d7..ea837d460543 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -645,17 +645,11 @@ table::CellAddress ScFormulaDlg::getReferencePosition() const return table::CellAddress(aCursorPos.Tab(),aCursorPos.Col(),aCursorPos.Row()); } -SAL_WNODEPRECATED_DECLARATIONS_PUSH -::std::auto_ptr<formula::FormulaTokenArray> ScFormulaDlg::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList) +::std::unique_ptr<formula::FormulaTokenArray> ScFormulaDlg::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList) { - ::std::auto_ptr<formula::FormulaTokenArray> pArray(new ScTokenArray()); + ::std::unique_ptr<formula::FormulaTokenArray> pArray(new ScTokenArray()); pArray->Fill(_aTokenList, pDoc->GetSharedStringPool(), pDoc->GetExternalRefManager()); return pArray; } -// for mysterious reasons Apple llvm-g++ 4.2.1 needs these explicit -// template instantiations; otherwise linking fails with unresolved symbols -template class ::std::auto_ptr<formula::FormulaTokenArray>; -template std::auto_ptr<formula::FormulaTokenArray>::operator std::auto_ptr_ref<formula::FormulaTokenArray>(); -SAL_WNODEPRECATED_DECLARATIONS_POP /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 62d4ebd572d0..66db8807c815 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -76,7 +76,7 @@ public: virtual OUString getCurrentFormula() const SAL_OVERRIDE; virtual formula::IFunctionManager* getFunctionManager() SAL_OVERRIDE; - virtual ::std::auto_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) SAL_OVERRIDE; + virtual ::std::unique_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const SAL_OVERRIDE; virtual ::com::sun::star::table::CellAddress getReferencePosition() const SAL_OVERRIDE; diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 74396315a16c..47738aaf2a28 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -491,11 +491,9 @@ bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, return !bError; } -SAL_WNODEPRECATED_DECLARATIONS_PUSH -ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler) -: formula::FormulaOpCodeMapperObj(_pCompiler) +ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::unique_ptr<formula::FormulaCompiler> && _pCompiler) +: formula::FormulaOpCodeMapperObj(std::move(_pCompiler)) { } -SAL_WNODEPRECATED_DECLARATIONS_POP /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |