diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 13:43:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 16:24:05 +0000 |
| commit | 3744d8506ef231d642785faf6da4926cea64c6a0 (patch) | |
| tree | 2d57ca5be9eda54aafb5065d7010bb50a37053ac /basctl | |
| parent | 7a17c038a6f4c433a69c6c1ed04aca2e5c929027 (diff) | |
boost->std
Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/inc/pch/precompiled_basctl.hxx | 2 | ||||
| -rw-r--r-- | basctl/source/basicide/iderdll.cxx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 3d8c89f624b2..f81441cd747e 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -97,7 +97,7 @@ #include <com/sun/star/util/theMacroExpander.hpp> #include <comphelper/documentinfo.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/scoped_disposing_ptr.hxx> +#include <comphelper/unique_disposing_ptr.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index b6d5e29b9124..959ed582287b 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/scoped_disposing_ptr.hxx> +#include <comphelper/unique_disposing_ptr.hxx> #include <comphelper/processfactory.hxx> #include <iderdll.hxx> @@ -48,7 +48,7 @@ namespace class Dll { Shell* m_pShell; - boost::scoped_ptr<ExtraData> m_pExtraData; + std::unique_ptr<ExtraData> m_xExtraData; public: Dll (); @@ -60,10 +60,10 @@ public: // Holds a basctl::Dll and release it on exit, or dispose of the //default XComponent, whichever comes first -class DllInstance : public comphelper::scoped_disposing_solar_mutex_reset_ptr<Dll> +class DllInstance : public comphelper::unique_disposing_solar_mutex_reset_ptr<Dll> { public: - DllInstance() : comphelper::scoped_disposing_solar_mutex_reset_ptr<Dll>(Reference<lang::XComponent>( frame::Desktop::create(comphelper::getProcessComponentContext()), UNO_QUERY_THROW), new Dll) + DllInstance() : comphelper::unique_disposing_solar_mutex_reset_ptr<Dll>(Reference<lang::XComponent>( frame::Desktop::create(comphelper::getProcessComponentContext()), UNO_QUERY_THROW), new Dll) { } }; @@ -137,9 +137,9 @@ Dll::Dll () : ExtraData* Dll::GetExtraData () { - if (!m_pExtraData) - m_pExtraData.reset(new ExtraData); - return m_pExtraData.get(); + if (!m_xExtraData) + m_xExtraData.reset(new ExtraData); + return m_xExtraData.get(); } } // namespace |