diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 11:30:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 14:12:07 +0100 |
| commit | ddc280920282ff3e2801e9a79f9dfa8a6c6f5699 (patch) | |
| tree | 4b477c76374f2f36659ba674c2e5d6796629d45b /sw/inc/ndgrf.hxx | |
| parent | 63e7b7afa75252298606c84e8ec82adaee5fa28a (diff) | |
boost->std
Change-Id: Idfbcfa1e5ba7bff92e98693c33c4b33a6beda08f
Diffstat (limited to 'sw/inc/ndgrf.hxx')
| -rw-r--r-- | sw/inc/ndgrf.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 65da31e73a87..bef476592e34 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -23,8 +23,7 @@ #include <svtools/grfmgr.hxx> #include <ndnotxt.hxx> #include <com/sun/star/embed/XStorage.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/weak_ptr.hpp> +#include <memory> class SwAsyncRetrieveInputStreamThreadConsumer; class SwGrfFormatColl; @@ -49,7 +48,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode bool bFrameInPaint :1; ///< To avoid Start-/EndActions in Paint via SwapIn. bool bScaleImageMap :1; ///< Scale image map in SetTwipSize. - boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer; + std::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer; bool mbLinkedInputStreamReady; com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream; bool mbIsStreamReadOnly; @@ -193,7 +192,7 @@ public: /// Returns the with our graphic attributes filled Graphic-Attr-Structure. GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const; - boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;} + std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;} bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;} void TriggerAsyncRetrieveInputStream(); void ApplyInputStream( |