diff options
author | David Tardon <dtardon@redhat.com> | 2012-04-16 16:38:06 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-04-16 20:23:16 +0200 |
commit | 7eb020a5b9d276e152354f93e6ce38a15e48ebd8 (patch) | |
tree | 7f51b72bdd59f3d313ce5a75437070a28fcb6f40 /fpicker/source/win32/filepicker/filepickerstate.cxx | |
parent | 037bb830ea9f40cae2ad0d2d97a6bf2b939e081b (diff) |
WaE: 'auto_ptr' is deprecated
Diffstat (limited to 'fpicker/source/win32/filepicker/filepickerstate.cxx')
-rw-r--r-- | fpicker/source/win32/filepicker/filepickerstate.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
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 <boost/scoped_ptr.hpp> + #include "filepickerstate.hxx" #include <osl/diagnose.h> #include "controlaccess.hxx" @@ -44,7 +46,6 @@ #include <osl/file.hxx> #include "FileOpenDlg.hxx" -#include <memory> #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" ); |