From 1df1c5eed9d44130fee818745cbb3d5ee59b7c3f Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 26 Sep 2014 15:46:31 +0200
Subject: formula: std::auto_ptr -> std::unique_ptr

Change-Id: I7b4784abf5177e22a9df33c5d4faccfd39801b11
---
 formula/source/core/api/FormulaOpCodeMapperObj.cxx | 18 ++++++++----------
 formula/source/ui/dlg/formula.cxx                  |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'formula')

diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index f57114e51d49..21b0f2261c44 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -16,6 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+#include <sal/config.h>
+
+#include <utility>
+
 #include "formula/FormulaOpCodeMapperObj.hxx"
 #include "formula/opcode.hxx"
 #include <comphelper/sequence.hxx>
@@ -30,12 +35,10 @@ sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const OUString& _rSer
     return cppu::supportsService(this, _rServiceName);
 }
 
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-FormulaOpCodeMapperObj::FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler)
-: m_pCompiler(_pCompiler)
+FormulaOpCodeMapperObj::FormulaOpCodeMapperObj(::std::unique_ptr<FormulaCompiler> && _pCompiler)
+: m_pCompiler(std::move(_pCompiler))
 {
 }
-SAL_WNODEPRECATED_DECLARATIONS_POP
 
 FormulaOpCodeMapperObj::~FormulaOpCodeMapperObj()
 {
@@ -102,16 +105,11 @@ uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNa
     return aSeq;
 }
 
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
 uno::Reference< uno::XInterface > SAL_CALL FormulaOpCodeMapperObj::create(
                 uno::Reference< uno::XComponentContext > const & /*_xContext*/)
 {
-    return static_cast<sheet::XFormulaOpCodeMapper*>(new FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler>(new FormulaCompiler())));
+    return static_cast<sheet::XFormulaOpCodeMapper*>(new FormulaOpCodeMapperObj(::std::unique_ptr<FormulaCompiler>(new FormulaCompiler())));
 }
-SAL_WNODEPRECATED_DECLARATIONS_POP
-
-
-
 
 } // formula
 
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index c8489ceb7abf..5573f72f152f 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -133,7 +133,7 @@ namespace formula
     public:
         mutable uno::Reference< sheet::XFormulaOpCodeMapper>    m_xOpCodeMapper;
         uno::Sequence< sheet::FormulaToken >                    m_aTokenList;
-        ::std::auto_ptr<FormulaTokenArray>                      m_pTokenArray;
+        ::std::unique_ptr<FormulaTokenArray>                    m_pTokenArray;
         mutable uno::Sequence< sheet::FormulaOpCodeMapEntry >   m_aSpecialOpCodes;
         mutable const sheet::FormulaOpCodeMapEntry*             m_pSpecialOpCodesEnd;
         mutable uno::Sequence< sheet::FormulaToken >            m_aSeparatorsOpCodes;
-- 
cgit