fpicker (Windows): std::auto_ptr -> std::unique_ptr

Change-Id: Id373c3ed6e483a501e07146812ff04353eafcc32

10 files changed, 15 insertions, 15 deletions

diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 8e6803636f7a..2e7cda51745c 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -76,7 +76,7 @@ CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xSer
     SAL_WARN_IF( !hInstance, "fpicker", "The name of the service dll must have changed" );
 
     // create a default FileOpen dialog without any additional ui elements
-    m_pImpl = std::auto_ptr< CWinFileOpenImpl >(
+    m_pImpl = std::unique_ptr< CWinFileOpenImpl >(
         new CWinFileOpenImpl(
             this,
             true,
@@ -682,7 +682,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
     // create a new impl-class here based on the
     // given string, if the given string is empty
     // we do nothing
-    m_pImpl = std::auto_ptr< CWinFileOpenImpl >(
+    m_pImpl = std::unique_ptr< CWinFileOpenImpl >(
         new CWinFileOpenImpl(
             this,
             bFileOpenDialog,
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 9aee615b9509..925d46614d8e 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -231,7 +231,7 @@ private:
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;   // to instanciate own services
     CAsyncEventNotifier                                                            m_aAsyncEventNotifier;
-    std::auto_ptr<CWinFileOpenImpl>                                                m_pImpl;
+    std::unique_ptr<CWinFileOpenImpl>                                                m_pImpl;
 };
 
 #endif
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
index e826e5431a89..0b4db89db117 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
@@ -156,8 +156,8 @@ protected:
     // singleton instance of this class
     virtual ~CFilePreview( );
 
-    // we use the stl auto_ptr class as singleton destroyer
-    typedef std::auto_ptr< CFilePreview > FILEPREVIEW_SINGLETON_DESTROYER_T;
+    // we use the stl unique_ptr class as singleton destroyer
+    typedef std::unique_ptr< CFilePreview > FILEPREVIEW_SINGLETON_DESTROYER_T;
 
 protected:
     virtual void SAL_CALL onPaint( HWND hWnd, HDC hDC );
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index 3383b89eaad5..dd9a4c2fbf83 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -197,10 +197,10 @@ private:
     static BOOL CALLBACK EnumChildWndProc( HWND hWnd, LPARAM lParam );
 
 private:
-    std::auto_ptr<CFilterContainer>         m_filterContainer;
-    std::auto_ptr<CPreviewAdapter>          m_Preview;
-    std::auto_ptr<CCustomControlFactory>    m_CustomControlFactory;
-    std::auto_ptr<CCustomControl>           m_CustomControls;
+    std::unique_ptr<CFilterContainer>       m_filterContainer;
+    std::unique_ptr<CPreviewAdapter>        m_Preview;
+    std::unique_ptr<CCustomControlFactory>  m_CustomControlFactory;
+    std::unique_ptr<CCustomControl>         m_CustomControls;
     CFilePicker*                            m_FilePicker;
     WNDPROC                                 m_pfnOldDlgProc;
     OUString                           m_defaultName;
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index b7df994283a2..f9cdd88bed04 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -260,7 +260,7 @@ void SAL_CALL CAsyncEventNotifier::run()
         {
             while (getEventListSize() > 0)
             {
-                std::auto_ptr<CEventNotification> EventNotification(getNextEventRecord());
+                std::unique_ptr<CEventNotification> EventNotification(getNextEventRecord());
                 removeNextEventRecord();
 
                 ::cppu::OInterfaceContainerHelper* pICHelper =
diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx
index ae63ff802eb6..b1d20d35c7c9 100644
--- a/fpicker/source/win32/filepicker/controlcommand.hxx
+++ b/fpicker/source/win32/filepicker/controlcommand.hxx
@@ -46,7 +46,7 @@ public:
 
     // the client inherits the ownership of the returned
     // CControlCommandResult and has to delete it or he may
-    // use the auto_ptr template for automatic deletion
+    // use the unique_ptr template for automatic deletion
     virtual CControlCommandResult* SAL_CALL handleRequest( CControlCommandRequest* aRequest );
 
     // clients of this method should use the returned
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index df66893c9a54..380750eb4d3b 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -86,7 +86,7 @@ protected:
 // member
 protected:
     HINSTANCE                   m_Instance;
-    std::auto_ptr<PreviewBase>  m_Preview;
+    std::unique_ptr<PreviewBase> m_Preview;
     HWND                        m_FileDialog;
     int                         m_RightMargin;
 
diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx
index fc05fa0013c0..dc40889b1939 100644
--- a/fpicker/source/win32/filepicker/previewadapter.hxx
+++ b/fpicker/source/win32/filepicker/previewadapter.hxx
@@ -87,7 +87,7 @@ public:
 private:
     // hide implementation details using the
     // bridge pattern
-    std::auto_ptr<CPreviewAdapterImpl> m_pImpl;
+    std::unique_ptr<CPreviewAdapterImpl> m_pImpl;
 
 // prevent copy and assignment
 private:
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index edf26984794b..9bc256efd3fc 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -64,7 +64,7 @@ namespace
 CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceMgr ) :
     m_xServiceMgr( xServiceMgr )
 {
-    m_pFolderPickerImpl = std::auto_ptr< CWinFolderPickerImpl > ( new CWinFolderPickerImpl( this ) );
+    m_pFolderPickerImpl = std::unique_ptr< CWinFolderPickerImpl > ( new CWinFolderPickerImpl( this ) );
 }
 
 
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 721ad68d4fb8..400ade088f74 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -99,7 +99,7 @@ public:
 
 private:
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;
-    std::auto_ptr< CWinFolderPickerImpl >   m_pFolderPickerImpl;
+    std::unique_ptr< CWinFolderPickerImpl >   m_pFolderPickerImpl;
     osl::Mutex  m_aMutex;
 
 // prevent copy and assignment