sc: std::auto_ptr -> std::unique_ptr

Change-Id: I25468d578de597ff9aeba3ffc850c630fa532767

8 files changed, 17 insertions, 25 deletions

diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx
index 01cfd99f858b..03b8b22762ac 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -171,7 +171,7 @@ private:
 
     ScDocument* GetDocument(ScTabViewShell* mpViewShell);
 
-    ::std::auto_ptr< SvxEditSource > CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos);
+    ::std::unique_ptr< SvxEditSource > CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos);
 
     void FillDependends(utl::AccessibleRelationSetHelper* pRelationSet);
     void FillPrecedents(utl::AccessibleRelationSetHelper* pRelationSet);
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index fc0b6ce0244c..a26a8739d7be 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -538,7 +538,7 @@ class ScAccessibleCsvCell : public ScAccessibleCsvControl, public accessibility:
 protected:
     typedef ::com::sun::star::uno::Sequence<
         ::com::sun::star::beans::PropertyValue >    PropertyValueSeq;
-    typedef ::std::auto_ptr< SvxEditSource >        SvxEditSourcePtr;
+    typedef ::std::unique_ptr< SvxEditSource >      SvxEditSourcePtr;
 
 private:
     OUString                    maCellText; /// The text contents of this cell.
@@ -630,7 +630,7 @@ private:
     Rectangle implGetBoundingBox() const;
 
     /** Creates the edit source the text helper needs. */
-    ::std::auto_ptr< SvxEditSource > implCreateEditSource();
+    ::std::unique_ptr< SvxEditSource > implCreateEditSource();
 };
 
 #endif
diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx
index 61cd3ae7c9a3..b6971378c017 100644
--- a/sc/source/ui/inc/AccessibleText.hxx
+++ b/sc/source/ui/inc/AccessibleText.hxx
@@ -282,8 +282,8 @@ private:
 class ScAccessibleCsvTextData : public ScAccessibleTextData
 {
 private:
-    typedef ::std::auto_ptr< SvxTextForwarder > TextForwarderPtr;
-    typedef ::std::auto_ptr< ScCsvViewForwarder > ViewForwarderPtr;
+    typedef ::std::unique_ptr< SvxTextForwarder > TextForwarderPtr;
+    typedef ::std::unique_ptr< ScCsvViewForwarder > ViewForwarderPtr;
 
     vcl::Window*                     mpWindow;
     EditEngine*                 mpEditEngine;
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index b189a2820492..6fcff6bd3752 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -44,12 +44,12 @@ class ScRangeList;
 class ScFormulaReferenceHelper
 {
     IAnyRefDialog*      m_pDlg;
-    ::std::auto_ptr<ScCompiler>         pRefComp;
+    ::std::unique_ptr<ScCompiler>         pRefComp;
     formula::RefEdit*    pRefEdit;               // active input field
     formula::RefButton*  pRefBtn;                // associated button
     vcl::Window*             m_pWindow;
     SfxBindings*        m_pBindings;
-    ::std::auto_ptr<Accelerator>
+    ::std::unique_ptr<Accelerator>
                         pAccel;                 // for Enter/Escape
     ::std::vector<vcl::Window*> m_aHiddenWidgets;    // vector of hidden Controls
     sal_Int32           m_nOldBorderWidth;      // border width for expanded dialog
diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx
index 1b6024872806..bab6dda53287 100644
--- a/sc/source/ui/inc/csvgrid.hxx
+++ b/sc/source/ui/inc/csvgrid.hxx
@@ -73,7 +73,7 @@ typedef ::std::vector< ScCsvColState > ScCsvColStateVec;
 class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener
 {
 private:
-    typedef ::std::auto_ptr< ScEditEngineDefaulter > ScEditEnginePtr;
+    typedef ::std::unique_ptr< ScEditEngineDefaulter > ScEditEnginePtr;
 
     VirtualDevice               maBackgrDev;        /// Grid background, headers, cell texts.
     VirtualDevice               maGridDev;          /// Data grid with selection and cursor.
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index e9ac66ca69fd..0c04545e1478 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -285,7 +285,7 @@ protected:
     bool IsPointerAtResizePos();
 private:
     ScPosWnd        aWndPos;
-    std::auto_ptr<ScTextWndBase> pRuntimeWindow;
+    std::unique_ptr<ScTextWndBase> pRuntimeWindow;
     ScTextWndBase&  aTextWindow;
     ScInputHandler* pInputHdl;
     OUString        aTextOk;
diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx
index d2a359e0e6a4..4c537106d36f 100644
--- a/sc/source/ui/inc/spelldialog.hxx
+++ b/sc/source/ui/inc/spelldialog.hxx
@@ -72,10 +72,10 @@ private:
     bool                IsSelectionChanged();
 
 private:
-    typedef ::std::auto_ptr< ScConversionEngineBase >   ScConvEnginePtr;
-    typedef ::std::auto_ptr< ScDocument >               ScDocumentPtr;
-    typedef ::std::auto_ptr< ScSelectionState >         ScSelectionStatePtr;
-    typedef ::std::auto_ptr< ScRangeList >              ScRangeListPtr;
+    typedef ::std::unique_ptr< ScConversionEngineBase >   ScConvEnginePtr;
+    typedef ::std::unique_ptr< ScDocument >               ScDocumentPtr;
+    typedef ::std::unique_ptr< ScSelectionState >         ScSelectionStatePtr;
+    typedef ::std::unique_ptr< ScRangeList >              ScRangeListPtr;
 
     ScConvEnginePtr     mxEngine;
     ScDocumentPtr       mxUndoDoc;
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index b9f573b3955b..fe43d95b16e3 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -347,9 +347,7 @@ private:
 class ScUndoDocProtect : public ScSimpleUndo
 {
 public:
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-                    ScUndoDocProtect(ScDocShell* pShell, ::std::auto_ptr<ScDocProtection> pProtectSettings);
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+                    ScUndoDocProtect(ScDocShell* pShell, ::std::unique_ptr<ScDocProtection> && pProtectSettings);
     virtual         ~ScUndoDocProtect();
 
     virtual void    Undo() SAL_OVERRIDE;
@@ -360,9 +358,7 @@ public:
     virtual OUString GetComment() const SAL_OVERRIDE;
 
 private:
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<ScDocProtection> mpProtectSettings;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<ScDocProtection> mpProtectSettings;
 
     void    DoProtect(bool bProtect);
 };
@@ -372,10 +368,8 @@ private:
 class ScUndoTabProtect : public ScSimpleUndo
 {
 public:
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
                     ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab,
-                                     ::std::auto_ptr<ScTableProtection> pProtectSettings);
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+                                     std::unique_ptr<ScTableProtection> && pProtectSettings);
     virtual         ~ScUndoTabProtect();
 
     virtual void    Undo() SAL_OVERRIDE;
@@ -387,9 +381,7 @@ public:
 
 private:
     SCTAB   mnTab;
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<ScTableProtection> mpProtectSettings;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<ScTableProtection> mpProtectSettings;
 
     void    DoProtect(bool bProtect);
 };