formula: std::auto_ptr -> std::unique_ptr

Change-Id: I7b4784abf5177e22a9df33c5d4faccfd39801b11

4 files changed, 6 insertions, 14 deletions

diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx
index f863697ab514..d04112ed0246 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -36,18 +36,14 @@ class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2<
                             ::com::sun::star::sheet::XFormulaOpCodeMapper,
                             ::com::sun::star::lang::XServiceInfo >
 {
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<FormulaCompiler> m_pCompiler;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<FormulaCompiler> m_pCompiler;
 public:
     static OUString  getImplementationName_Static();
     static ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_Static();
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext);
 
 protected:
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-                            FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler);
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+                            FormulaOpCodeMapperObj(::std::unique_ptr<FormulaCompiler> && _pCompiler);
     virtual                 ~FormulaOpCodeMapperObj();
 
 private:
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index 579d36b3bc49..1b37d5128244 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -147,7 +147,7 @@ namespace formula
         virtual void setReferenceInput(const FormEditData* _pData) = 0;
 
         virtual IFunctionManager*   getFunctionManager() = 0;
-        virtual ::std::auto_ptr<FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) = 0;
+        virtual ::std::unique_ptr<FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) = 0;
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const = 0;
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const = 0;
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index ed412c58ac64..cfa13a21d086 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -59,9 +59,7 @@ public:
     virtual ~FormulaModalDialog();
 
 private:
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<FormulaDlg_Impl> m_pImpl;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<FormulaDlg_Impl> m_pImpl;
 
 protected:
 
@@ -99,9 +97,7 @@ public:
                                     , IControlReferenceHandler* _pDlg = NULL );
     virtual ~FormulaDlg();
 private:
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<FormulaDlg_Impl> m_pImpl;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<FormulaDlg_Impl> m_pImpl;
 
     DECL_LINK( UpdateFocusHdl, void*);
 protected:
diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx
index 4bcd8645a2e2..22316bb4beeb 100644
--- a/include/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
@@ -33,7 +33,7 @@ namespace formula
 {
     class FORMULA_DLLPUBLIC FormulaHelper
     {
-        ::std::auto_ptr<SvtSysLocale>   m_pSysLocale;
+        ::std::unique_ptr<SvtSysLocale> m_pSysLocale;
         const CharClass*                m_pCharClass;
         const IFunctionManager*         m_pFunctionManager;
         const sal_Unicode open;