7 files changed, 9 insertions, 11 deletions
diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx
index f0b5e2ba9e77..f9901e26c289 100644
--- a/sd/source/ui/inc/taskpane/ControlContainer.hxx
+++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx
@@ -74,7 +74,7 @@ public:
             the container.  It is the same index that is returned by
             GetControlIndex().
     */
-    sal_uInt32 AddControl (::std::auto_ptr<TreeNode> pControl);
+    sal_uInt32 AddControl (::std::unique_ptr<TreeNode> && pControl);
 
     /** Expand (default) or collapse the specified control.  When
         expanding a control in a single expansion environment then all
diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
index a57cdfb851ea..77daddd51e4c 100644
--- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx
+++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
@@ -66,13 +66,13 @@ public:
             title bar as children is returned.
     */
     TitledControl* AddControl (
-        ::std::auto_ptr<TreeNode> pControl,
+        ::std::unique_ptr<TreeNode> && pControl,
         const OUString& rTitle,
         const OString& sHelpId);
 
     /** Add a control to the sub panel without a title bar.
     */
-    void AddControl (::std::auto_ptr<TreeNode> pControl);
+    void AddControl (::std::unique_ptr<TreeNode> && pControl);
 
     virtual void Paint (const Rectangle& rRect);
 
diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
index d80f5c49683e..61d6bf6db578 100644
--- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
+++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
@@ -47,7 +47,7 @@ public:
 
         Derived classes should overload InternalCreateControl.
     */
-    ::std::auto_ptr<TreeNode> CreateControl( vcl::Window& i_rParent );
+    ::std::unique_ptr<TreeNode> CreateControl( vcl::Window& i_rParent );
 
 protected:
     virtual TreeNode* InternalCreateControl( vcl::Window& i_rParent ) = 0;
diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
index 96121085cd98..797b7545a3fc 100644
--- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
+++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
@@ -168,7 +168,7 @@ public:
         TreeNode* pChild = NULL) const;
 
 protected:
-    ::std::auto_ptr<ControlContainer> mpControlContainer;
+    ::std::unique_ptr<ControlContainer> mpControlContainer;
 
 private:
     TreeNode* mpParent;
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx
index d6910acfbebc..05f34c540cf7 100644
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -94,9 +94,7 @@ private:
     bool mbExpanded;
     bool mbFocused;
     // Size of the bounding box that encloses the title string.
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<VirtualDevice> mpDevice;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<VirtualDevice> mpDevice;
     bool mbIsExpandable;
 
     /** Return whether this TitleBar object has an expansion indicator
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx
index 6282a549a6a7..bf1e183ac519 100644
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -63,7 +63,7 @@ public:
     */
     TitledControl (
         TreeNode* pParent,
-        ::std::auto_ptr<TreeNode> pControl,
+        ::std::unique_ptr<TreeNode> pControl,
         const OUString& rTitle,
         const ClickHandler& rClickHandler,
         TitleBar::TitleBarType eType);
@@ -128,7 +128,7 @@ private:
     OUString msTitle;
     bool mbVisible;
     void* mpUserData;
-    ::std::auto_ptr<ClickHandler> mpClickHandler;
+    ::std::unique_ptr<ClickHandler> mpClickHandler;
 
     /// Do not use! Assignment operator is not supported.
     const TitledControl& operator= (
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 894f5d5bad50..522deeb59f67 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -137,7 +137,7 @@ private:
             According to this flag one of the lock/unlock entries is
             made disabled.
     */
-    ::std::auto_ptr<PopupMenu> CreatePopupMenu (bool bIsDocking);
+    ::std::unique_ptr<PopupMenu> CreatePopupMenu (bool bIsDocking);
 
     /** Initialize the task pane view shell if that has not yet been done
         before.  If mbIsInitialized is already set to <TRUE/> then this