diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-01-18 05:54:58 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2014-01-18 08:08:52 +0900 |
| commit | 5e6d1e3332ea4cd31d2c5e739dc27bb37b34b4dc (patch) | |
| tree | 256c9d1d3d644d66e3e19beffe5418ea9c445fe2 /sw/source/ui/uno/unomailmerge.cxx | |
| parent | 8e826c7ff7c597e9f585377b2117f4dc24239dcc (diff) | |
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: Ib05c6d509a71e01b50b2e23588da607f29036711
Diffstat (limited to 'sw/source/ui/uno/unomailmerge.cxx')
| -rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 717a0959330b..b6c93a0795dc 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -67,10 +67,11 @@ #include <shellio.hxx> #include <mmconfigitem.hxx> #include <mailmergehelper.hxx> -#include <memory> #include <unomid.h> +#include <boost/scoped_ptr.hpp> + using namespace ::com::sun::star; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::uno; @@ -657,7 +658,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( SwMergeDescriptor aMergeDesc( nMergeType, rSh, aDescriptor ); - std::auto_ptr< SwMailMergeConfigItem > pMMConfigItem; + boost::scoped_ptr< SwMailMergeConfigItem > pMMConfigItem; uno::Reference< mail::XMailService > xInService; if (MailMergeType::PRINTER == nCurOutputType) { |