diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 16:40:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-18 11:00:17 +0000 |
| commit | c19c242ec0757d5d5f2936e2a57430e39c692b2b (patch) | |
| tree | fe8f71cab2739904472e74597e04aadefd9d19dc /sw/inc/node.hxx | |
| parent | 1215efbf616024bc262f94c38038d6de6d960b17 (diff) | |
boost->std
Change-Id: I412137e7e7b9b2b87f401bc140a9499d1fc012c6
Diffstat (limited to 'sw/inc/node.hxx')
| -rw-r--r-- | sw/inc/node.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index c6e1731a6556..03dc719b8c25 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -20,11 +20,6 @@ #ifndef INCLUDED_SW_INC_NODE_HXX #define INCLUDED_SW_INC_NODE_HXX -#include <vector> - -#include <boost/utility.hpp> -#include <boost/shared_ptr.hpp> - #include <sal/types.h> #include <tools/mempool.hxx> @@ -34,6 +29,9 @@ #include <index.hxx> #include <fmtcol.hxx> +#include <memory> +#include <vector> + // forward declarations class SwCntntFrm; @@ -77,7 +75,7 @@ typedef std::vector<SwOLENode*> SwOLENodes; // docary.hxx //UUUU namespace drawinglayer { namespace attribute { class SdrAllFillAttributesHelper; - typedef boost::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr; + typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr; }} /// Base class of the Writer document model elements. @@ -363,7 +361,7 @@ protected: /** Attribute-set for all auto attributes of a CntntNode. (e.g. TxtNode or NoTxtNode). */ - boost::shared_ptr<const SfxItemSet> mpAttrSet; + std::shared_ptr<const SfxItemSet> mpAttrSet; /// Make respective nodes create the specific AttrSets. virtual void NewAttrSet( SwAttrPool& ) = 0; @@ -525,12 +523,14 @@ private: class SwSectionNode : public SwStartNode - , private ::boost::noncopyable { friend class SwNodes; private: - ::std::unique_ptr<SwSection> const m_pSection; + SwSectionNode(const SwSectionNode&) SAL_DELETED_FUNCTION; + SwSectionNode& operator=(const SwSectionNode&) SAL_DELETED_FUNCTION; + + std::unique_ptr<SwSection> const m_pSection; protected: virtual ~SwSectionNode(); |