diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 17:39:16 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 18:37:51 +0200 |
| commit | 0b23ac2c9d36c89137feeb82d0aed7a8628a53b7 (patch) | |
| tree | 7a09059a896afcc739eb30559043275144217a98 /include | |
| parent | b78b143416789307f29bf6e9d06ae49689d9a18f (diff) | |
vbahelper: std::auto_ptr -> std::unique_ptr
Change-Id: Ic1b28e7f79cc7dad6a045eb64e5191991533990d
Diffstat (limited to 'include')
| -rw-r--r-- | include/vbahelper/vbahelper.hxx | 2 | ||||
| -rw-r--r-- | include/vbahelper/vbashape.hxx | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index 7b2d811f10c0..a5d119b3ac78 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -173,7 +173,7 @@ public: class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes : public AbstractGeometryAttributes { - std::auto_ptr< ShapeHelper > m_pShapeHelper; + std::unique_ptr< ShapeHelper > m_pShapeHelper; public: ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape ); virtual double getLeft() const SAL_OVERRIDE; diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx index 838ad437ea21..98860eb82d6c 100644 --- a/include/vbahelper/vbashape.hxx +++ b/include/vbahelper/vbashape.hxx @@ -37,9 +37,7 @@ typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE; class VBAHELPER_DLLPUBLIC ScVbaShape : public ScVbaShape_BASE { protected: - SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< ov::ShapeHelper > m_pShapeHelper; - SAL_WNODEPRECATED_DECLARATIONS_POP + std::unique_ptr< ov::ShapeHelper > m_pShapeHelper; css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::drawing::XShapes > m_xShapes; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; |