summaryrefslogtreecommitdiff
path: root/include/sfx2/Metadatable.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-17 16:40:00 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-18 11:00:17 +0000
commitc19c242ec0757d5d5f2936e2a57430e39c692b2b (patch)
treefe8f71cab2739904472e74597e04aadefd9d19dc /include/sfx2/Metadatable.hxx
parent1215efbf616024bc262f94c38038d6de6d960b17 (diff)
boost->std
Change-Id: I412137e7e7b9b2b87f401bc140a9499d1fc012c6
Diffstat (limited to 'include/sfx2/Metadatable.hxx')
-rw-r--r--include/sfx2/Metadatable.hxx15
1 files changed, 8 insertions, 7 deletions
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index e69fd3f536a6..0cd51ecf163d 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -26,8 +26,7 @@
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/rdf/XMetadatable.hpp>
-#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace com { namespace sun { namespace star {
@@ -64,9 +63,8 @@ createXmlIdRegistry(const bool i_DocIsClipboard);
previous hooks</li></ul>
</p>
*/
-class SFX2_DLLPUBLIC Metadatable : private boost::noncopyable
+class SFX2_DLLPUBLIC Metadatable
{
-
public:
Metadatable() : m_pReg(0) {}
@@ -90,11 +88,11 @@ public:
const bool i_bCopyPrecedesSource = false);
/** create an Undo Metadatable, which remembers this' reference */
- ::boost::shared_ptr<MetadatableUndo> CreateUndo() const;
- ::boost::shared_ptr<MetadatableUndo> CreateUndoForDelete();
+ std::shared_ptr<MetadatableUndo> CreateUndo() const;
+ std::shared_ptr<MetadatableUndo> CreateUndoForDelete();
/** restore this from Undo Metadatable */
- void RestoreMetadata(::boost::shared_ptr<MetadatableUndo> const& i_pUndo);
+ void RestoreMetadata(std::shared_ptr<MetadatableUndo> const& i_pUndo);
/** merge this and i_rOther into this */
void JoinMetadatable(Metadatable const & i_rOther,
@@ -122,6 +120,9 @@ public:
::com::sun::star::rdf::XMetadatable > MakeUnoObject() = 0;
private:
+ Metadatable(const Metadatable&) SAL_DELETED_FUNCTION;
+ Metadatable& operator=(const Metadatable&) SAL_DELETED_FUNCTION;
+
friend class MetadatableClipboard;
friend class MetadatableUndo;