From 4e820251892917a92996f1aa6978ad609112001c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 24 Sep 2014 16:03:36 +0200
Subject: Replace some std::auto_ptr function parameters with std::unique_ptr

Change-Id: Ic66d325fd9559c6dde9556c26e5b2a7e60376c49
---
 starmath/source/accessibility.cxx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'starmath/source/accessibility.cxx')

diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 6388cc604dd1..5ef11689e616 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -17,6 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <memory>
+#include <utility>
+
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
@@ -1647,9 +1652,9 @@ void SmEditAccessible::Init()
         EditView   *pEditView   = pWin->GetEditView();
         if (pEditEngine && pEditView)
         {
-            ::std::auto_ptr< SvxEditSource > pEditSource(
+            ::std::unique_ptr< SvxEditSource > pEditSource(
                     new SmEditSource( pWin, *this ) );
-            pTextHelper = new ::accessibility::AccessibleTextHelper( pEditSource );
+            pTextHelper = new ::accessibility::AccessibleTextHelper( std::move(pEditSource) );
             pTextHelper->SetEventSource( this );
         }
     }
@@ -1666,9 +1671,7 @@ void SmEditAccessible::ClearWin()
     pWin = 0;   // implicitly results in AccessibleStateType::DEFUNC set
 
     //! make TextHelper implicitly release C++ references to some core objects
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    pTextHelper->SetEditSource( ::std::auto_ptr<SvxEditSource>(NULL) );
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    pTextHelper->SetEditSource( ::std::unique_ptr<SvxEditSource>() );
     //! make TextHelper release references
     //! (e.g. the one set by the 'SetEventSource' call)
     pTextHelper->Dispose();
-- 
cgit