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 /reportdesign | |
| parent | 296371d5d8f58c46e976f66b11599410d97dc472 (diff) | |
formula: std::auto_ptr -> std::unique_ptr
Change-Id: I7b4784abf5177e22a9df33c5d4faccfd39801b11
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 11 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/Formula.hxx | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 5fd26171884f..bb6047d5b891 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -253,20 +253,13 @@ table::CellAddress FormulaDialog::getReferencePosition() const return table::CellAddress(); } -SAL_WNODEPRECATED_DECLARATIONS_PUSH -::std::auto_ptr<formula::FormulaTokenArray> FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList) +::std::unique_ptr<formula::FormulaTokenArray> FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList) { - ::std::auto_ptr<formula::FormulaTokenArray> pArray(new FormulaTokenArray()); + ::std::unique_ptr<formula::FormulaTokenArray> pArray(new FormulaTokenArray()); pArray->Fill(_aTokenList, mrStringPool, NULL); return pArray; } } // rptui -// 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/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 46036de6107a..f6d686747f1e 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -93,7 +93,7 @@ public: 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; - 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; // IControlReferenceHandler virtual void ShowReference(const OUString& _sRef) SAL_OVERRIDE; |