diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-26 17:20:31 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-26 17:21:20 +0900 |
| commit | d5c59404bec65c8a9d9e05c1fcc24e068d170924 (patch) | |
| tree | f19f1aca9c529e78509b2ad777ae52dcabc52c71 /uui | |
| parent | d60301d03b098e1d45b8de6b169e9fb54600c3f1 (diff) | |
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I773524536c0ed7bc34eb08cd35cfc77e83f722ba
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl-errorhandler.cxx | 7 | ||||
| -rw-r--r-- | uui/source/iahndl-filter.cxx | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 6d65d66d8660..80b2952c5e90 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <memory> - #include "osl/mutex.hxx" #include "vcl/svapp.hxx" #include "vcl/msgbox.hxx" @@ -35,6 +33,7 @@ #include "getcontinuations.hxx" #include "iahndl.hxx" +#include <boost/scoped_ptr.hpp> using namespace com::sun::star; @@ -57,7 +56,7 @@ executeErrorDialog( //TODO! must be internationalized aText.append(rMessage); - std::auto_ptr< MessBox > xBox; + boost::scoped_ptr< MessBox > xBox; try { switch (eClassification) @@ -170,7 +169,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( SOURCE_UUI; SolarMutexGuard aGuard; - std::auto_ptr< ResMgr > xManager; + boost::scoped_ptr< ResMgr > xManager; xManager.reset(ResMgr::CreateResMgr(aManager[eSource])); if (!xManager.get()) return; diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index d67717aa7f1a..8db625552969 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -39,6 +39,7 @@ #include "fltdlg.hxx" #include "iahndl.hxx" +#include <boost/scoped_ptr.hpp> using namespace com::sun::star; @@ -56,9 +57,9 @@ executeFilterDialog( { SolarMutexGuard aGuard; - std::auto_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); + boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); - std::auto_ptr< uui::FilterDialog > xDialog( + boost::scoped_ptr< uui::FilterDialog > xDialog( new uui::FilterDialog(pParent, xManager.get())); xDialog->SetURL(rURL); |