summaryrefslogtreecommitdiff
path: root/writerfilter/inc
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-12-30 20:29:56 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-12-30 20:43:29 +0100
commit54bd92d7fce1ec4d8d779751168c698cc44a33ba (patch)
tree8a8bc1d4041fb318d12bd647f96f226bc9099981 /writerfilter/inc
parentb4a30a53f72eb286da502656ccde539fb449c92f (diff)
writerfilter: boost::shared_ptr -> c++11 std::shared_ptr
Change-Id: Ib5649d8979093bb147c61eebcf95a472ad899672
Diffstat (limited to 'writerfilter/inc')
-rw-r--r--writerfilter/inc/dmapper/resourcemodel.hxx7
-rw-r--r--writerfilter/inc/ooxml/OOXMLDocument.hxx4
-rw-r--r--writerfilter/inc/ooxml/QNameToString.hxx4
-rw-r--r--writerfilter/inc/pch/precompiled_writerfilter.hxx2
-rw-r--r--writerfilter/inc/rtftok/RTFDocument.hxx2
5 files changed, 9 insertions, 10 deletions
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx
index 0e0775792b92..d76a0a464d79 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -22,7 +22,6 @@
#include <string>
#include <memory>
-#include <boost/shared_ptr.hpp>
#include <sal/types.h>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/uno/Any.hxx>
@@ -86,7 +85,7 @@ public:
@attention The ownership of a reference is transferred when
the reference is passed.
*/
- typedef boost::shared_ptr< Reference<T> > Pointer_t;
+ typedef std::shared_ptr< Reference<T> > Pointer_t;
/**
Resolves the reference.
@@ -136,7 +135,7 @@ protected:
class Table
{
public:
- typedef boost::shared_ptr<Table> Pointer_t;
+ typedef std::shared_ptr<Table> Pointer_t;
/**
Receives an entry of the table.
@@ -184,7 +183,7 @@ public:
/**
Pointer to this stream.
*/
- typedef boost::shared_ptr<Stream> Pointer_t;
+ typedef std::shared_ptr<Stream> Pointer_t;
/**
Receives start mark for group with the same section properties.
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 8882f42d9e43..c533e359eb86 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -76,7 +76,7 @@ class OOXMLStream
public:
enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, WEBSETTINGS, FONTTABLE, NUMBERING,
FOOTNOTES, ENDNOTES, COMMENTS, THEME, CUSTOMXML, CUSTOMXMLPROPS, ACTIVEX, ACTIVEXBIN, GLOSSARY, CHARTS, EMBEDDINGS, SETTINGS, VBAPROJECT, FOOTER, HEADER, SIGNATURE };
- typedef boost::shared_ptr<OOXMLStream> Pointer_t;
+ typedef std::shared_ptr<OOXMLStream> Pointer_t;
virtual ~OOXMLStream() {}
@@ -121,7 +121,7 @@ public:
/**
Pointer to this stream.
*/
- typedef boost::shared_ptr<OOXMLDocument> Pointer_t;
+ typedef std::shared_ptr<OOXMLDocument> Pointer_t;
virtual ~OOXMLDocument() {}
diff --git a/writerfilter/inc/ooxml/QNameToString.hxx b/writerfilter/inc/ooxml/QNameToString.hxx
index 88abc59502a1..a525eb881d60 100644
--- a/writerfilter/inc/ooxml/QNameToString.hxx
+++ b/writerfilter/inc/ooxml/QNameToString.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
#define INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <map>
#include <string>
#include <iostream>
@@ -31,7 +31,7 @@ namespace writerfilter
class QNameToString
{
- typedef boost::shared_ptr<QNameToString> Pointer_t;
+ typedef std::shared_ptr<QNameToString> Pointer_t;
typedef std::map < Id, std::string > Map;
static Pointer_t pInstance;
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index 46727f5a5aea..ded05d08b239 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -18,7 +18,7 @@
#include "oox/token/tokens.hxx"
#include <algorithm>
#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/tuple/tuple.hpp>
#include <boost/unordered_map.hpp>
#include <com/sun/star/awt/FontPitch.hpp>
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx b/writerfilter/inc/rtftok/RTFDocument.hxx
index 8b6878030647..bea19a4f7bc2 100644
--- a/writerfilter/inc/rtftok/RTFDocument.hxx
+++ b/writerfilter/inc/rtftok/RTFDocument.hxx
@@ -26,7 +26,7 @@ class RTFDocument
{
public:
/// Pointer to this stream.
- typedef boost::shared_ptr<RTFDocument> Pointer_t;
+ typedef std::shared_ptr<RTFDocument> Pointer_t;
virtual ~RTFDocument() { }