summaryrefslogtreecommitdiff
path: root/include/filter/msfilter/msdffimp.hxx
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/filter/msfilter/msdffimp.hxx
parent18f41dfaf19d656d290c47d196ef2702e169a522 (diff)
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'include/filter/msfilter/msdffimp.hxx')
-rw-r--r--include/filter/msfilter/msdffimp.hxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index c85429eecd84..a6fdf663c0d4 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -27,7 +27,6 @@
#include <set>
#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/ptr_container/ptr_set.hpp>
@@ -400,8 +399,8 @@ class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader
{
FmFormModel* pFormModel;
SvxMSDffBLIPInfos* pBLIPInfos;
- ::boost::scoped_ptr<SvxMSDffShapeInfos_ByTxBxComp> m_pShapeInfosByTxBxComp;
- ::boost::scoped_ptr<SvxMSDffShapeInfos_ById> m_pShapeInfosById;
+ std::unique_ptr<SvxMSDffShapeInfos_ByTxBxComp> m_xShapeInfosByTxBxComp;
+ std::unique_ptr<SvxMSDffShapeInfos_ById> m_xShapeInfosById;
SvxMSDffShapeOrders* pShapeOrders;
sal_uLong nDefaultFontHeight;
sal_uInt32 nOffsDgg;
@@ -682,7 +681,7 @@ public:
const Rectangle& rGlobalChildRect );
inline const SvxMSDffShapeInfos_ById* GetShapeInfos( void ) const
- { return m_pShapeInfosById.get(); }
+ { return m_xShapeInfosById.get(); }
inline SvxMSDffShapeOrders* GetShapeOrders( void ) const
{ return pShapeOrders; }