From 402bb706da7a43ee8c161cab5a5fc4d05b965051 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 26 Sep 2014 10:14:08 +0200
Subject: filter: std::auto_ptr -> std::unique_ptr

Change-Id: Id1d0392e1dbd33de326aa2bd8cbcf8cc03bf7c90
---
 include/filter/msfilter/escherex.hxx  | 10 +++-------
 include/filter/msfilter/mstoolbar.hxx |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 1b86971ea1b8..29de8abcfec6 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1415,9 +1415,7 @@ public:
 class InteractionInfo
 {
     bool mbHasInteraction;
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    std::auto_ptr<SvMemoryStream>       mpHyperlinkRecord;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    std::unique_ptr<SvMemoryStream>       mpHyperlinkRecord;
     InteractionInfo();
 
 public:
@@ -1426,9 +1424,7 @@ public:
         mpHyperlinkRecord.reset( pStream );
     }
     bool    hasInteraction() { return mbHasInteraction; }
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    const std::auto_ptr< SvMemoryStream >&  getHyperlinkRecord() { return mpHyperlinkRecord; }
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    const std::unique_ptr< SvMemoryStream >&  getHyperlinkRecord() { return mpHyperlinkRecord; }
 };
 
 class EscherExHostAppData
@@ -1567,7 +1563,7 @@ class ImplEscherExSdr;
 class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable
 {
     protected:
-        typedef ::std::auto_ptr< ImplEscherExSdr > ImplEscherExSdrPtr;
+        typedef ::std::unique_ptr< ImplEscherExSdr > ImplEscherExSdrPtr;
 
         EscherExGlobalRef           mxGlobal;
         ImplEscherExSdrPtr          mpImplEscherExSdr;
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 8dbea1b6048a..e71e873831e6 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -44,7 +44,7 @@ class MSFILTER_DLLPUBLIC CustomToolBarImportHelper
         css::uno::Reference< css::graphic::XGraphic > image;
     };
     std::vector< iconcontrolitem > iconcommands;
-    std::auto_ptr< MSOCommandConvertor > pMSOCmdConvertor;
+    std::unique_ptr< MSOCommandConvertor > pMSOCmdConvertor;
     css::uno::Reference< css::ui::XUIConfigurationManagerSupplier > m_xCfgSupp;
     css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
     SfxObjectShell& mrDocSh;
-- 
cgit