diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-22 21:51:27 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-22 21:51:27 +0900 |
| commit | 3b06e5e646878c751c02f395dce9002822895f07 (patch) | |
| tree | d6c010835546334c376b3c42af66cc2b62994a68 /dbaccess/source/ui/tabledesign | |
| parent | d41c58164f8e743b9bf7a8983174f71771872472 (diff) | |
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I1ebfb33063d39f64dc59623df0f942501870c4e7
Diffstat (limited to 'dbaccess/source/ui/tabledesign')
| -rw-r--r-- | dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TableDesignView.cxx | 13 |
2 files changed, 6 insertions, 10 deletions
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 8ddece24afb3..980da26282f7 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -24,6 +24,7 @@ #include "TableFieldControl.hxx" #include "TableDesignView.hxx" #include "TEditControl.hxx" +#include <boost/scoped_ptr.hpp> using namespace dbaui; // class OFieldDescGenWin @@ -38,7 +39,7 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp OFieldDescGenWin::~OFieldDescGenWin() { - ::std::auto_ptr<Window> aTemp(m_pFieldControl); + boost::scoped_ptr<Window> aTemp(m_pFieldControl); m_pFieldControl = NULL; } diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 36302780cd0c..d243b2673f4e 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -31,6 +31,7 @@ #include <unotools/syslocale.hxx> #include <vcl/settings.hxx> #include "UITools.hxx" +#include <boost/scoped_ptr.hpp> using namespace ::dbaui; using namespace ::utl; @@ -67,15 +68,11 @@ OTableBorderWindow::~OTableBorderWindow() m_pFieldDescWin->Hide(); { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<Window> aTemp(m_pEditorCtrl); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr<Window> aTemp(m_pEditorCtrl); m_pEditorCtrl = NULL; } { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<Window> aTemp(m_pFieldDescWin); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr<Window> aTemp(m_pFieldDescWin); m_pFieldDescWin = NULL; } @@ -196,9 +193,7 @@ OTableDesignView::~OTableDesignView() m_pWin->Hide(); { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<Window> aTemp(m_pWin); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr<Window> aTemp(m_pWin); m_pWin = NULL; } } |