summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-15 20:41:33 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-16 12:54:44 +0000
commita1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 (patch)
tree56a29f66f75f326a0a677ab1697ce28f1bc9fcbf /include/svl
parent18f41dfaf19d656d290c47d196ef2702e169a522 (diff)
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/asiancfg.hxx4
-rw-r--r--include/svl/undo.hxx7
2 files changed, 5 insertions, 6 deletions
diff --git a/include/svl/asiancfg.hxx b/include/svl/asiancfg.hxx
index 0652a5dace12..127eb009a973 100644
--- a/include/svl/asiancfg.hxx
+++ b/include/svl/asiancfg.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <com/sun/star/uno/Sequence.hxx>
#include <sal/types.h>
#include <svl/svldllapi.h>
@@ -62,7 +62,7 @@ public:
private:
struct Impl;
- boost::scoped_ptr< Impl > impl_;
+ std::unique_ptr< Impl > impl_;
};
#endif
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index d0132daf9d6c..d9b12274aae5 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -23,9 +23,8 @@
#include <rtl/ustring.hxx>
#include <tools/rtti.hxx>
-#include <boost/scoped_ptr.hpp>
-
#include <limits>
+#include <memory>
struct MarkedUndoAction;
@@ -313,8 +312,8 @@ class SVL_DLLPUBLIC SfxUndoManager : public ::svl::IUndoManager
{
friend class SfxLinkUndoAction;
- ::boost::scoped_ptr< SfxUndoManager_Data >
- m_pData;
+ std::unique_ptr< SfxUndoManager_Data >
+ m_xData;
public:
SfxUndoManager( size_t nMaxUndoActionCount = 20 );
virtual ~SfxUndoManager();