From 7eb020a5b9d276e152354f93e6ce38a15e48ebd8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 16 Apr 2012 16:38:06 +0200 Subject: WaE: 'auto_ptr' is deprecated --- fpicker/source/win32/filepicker/filepickerstate.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'fpicker') diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx index a133ce73336c..3dde8585d369 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.cxx +++ b/fpicker/source/win32/filepicker/filepickerstate.cxx @@ -30,6 +30,8 @@ //------------------------------------------------------------------------ // includes //------------------------------------------------------------------------ +#include + #include "filepickerstate.hxx" #include #include "controlaccess.hxx" @@ -44,7 +46,6 @@ #include #include "FileOpenDlg.hxx" -#include #include "../misc/WinImplHelper.hxx" //--------------------------------------------- // @@ -117,7 +118,7 @@ Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int if (m_FirstControlCommand) { // pass the request along the command-chain - std::auto_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &value_request ) ); + boost::scoped_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &value_request ) ); OSL_ENSURE( result.get(), "invalid getValue request" ); @@ -181,7 +182,7 @@ OUString SAL_CALL CNonExecuteFilePickerState::getLabel( sal_Int16 aControlId ) CControlCommandRequest label_request( aControlId ); // pass the request along the command-chain - std::auto_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &label_request ) ); + boost::scoped_ptr< CControlCommandResult > result( m_FirstControlCommand->handleRequest( &label_request ) ); OSL_ENSURE( result->hasResult( ), "invalid getValue request" ); -- cgit