diff options
-rw-r--r-- | include/vbahelper/vbahelper.hxx | 2 | ||||
-rw-r--r-- | include/vbahelper/vbashape.hxx | 4 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacombobox.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacontrol.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbalistbox.hxx | 4 |
6 files changed, 7 insertions, 11 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; diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx index 7491cb4613a3..9d12a3e48491 100644 --- a/vbahelper/source/msforms/vbacombobox.hxx +++ b/vbahelper/source/msforms/vbacombobox.hxx @@ -34,7 +34,7 @@ typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE; class ScVbaComboBox : public ComboBoxImpl_BASE { - std::auto_ptr< ListControlHelper > mpListHelper; + std::unique_ptr< ListControlHelper > mpListHelper; OUString sSourceName; OUString msDftPropName; diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index e0a62ad9d256..31588f401c58 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -611,7 +611,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R xProps->getPropertyValue( "ClassId" ) >>= nClassId; uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess uno::Reference< drawing::XShape > xShape( xControlShape, uno::UNO_QUERY_THROW ); - ::std::auto_ptr< ConcreteXShapeGeometryAttributes > xGeoHelper( new ConcreteXShapeGeometryAttributes( xContext, xShape ) ); + ::std::unique_ptr< ConcreteXShapeGeometryAttributes > xGeoHelper( new ConcreteXShapeGeometryAttributes( xContext, xShape ) ); switch( nClassId ) { case form::FormComponentType::COMBOBOX: @@ -656,7 +656,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R uno::Reference< lang::XServiceInfo > xServiceInfo( xProps, uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xVBAControl; uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess - ::std::auto_ptr< UserFormGeometryHelper > xGeoHelper( new UserFormGeometryHelper( xContext, xControl, fOffsetX, fOffsetY ) ); + ::std::unique_ptr< UserFormGeometryHelper > xGeoHelper( new UserFormGeometryHelper( xContext, xControl, fOffsetX, fOffsetY ) ); if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) ) xVBAControl.set( new ScVbaCheckbox( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) ); diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx index 3e2d4f5c2c9c..4317f3743bcd 100644 --- a/vbahelper/source/msforms/vbacontrol.hxx +++ b/vbahelper/source/msforms/vbacontrol.hxx @@ -49,7 +49,7 @@ protected: bool bIsDialog; OUString m_sLibraryAndCodeName; - std::auto_ptr< ov::AbstractGeometryAttributes > mpGeometryHelper; + std::unique_ptr< ov::AbstractGeometryAttributes > mpGeometryHelper; css::uno::Reference< css::beans::XPropertySet > m_xProps; css::uno::Reference< css::uno::XInterface > m_xControl; css::uno::Reference< css::frame::XModel > m_xModel; diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx index 7677920083ba..ed20cdb775bf 100644 --- a/vbahelper/source/msforms/vbalistbox.hxx +++ b/vbahelper/source/msforms/vbalistbox.hxx @@ -33,9 +33,7 @@ typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::s class ScVbaListBox : public ListBoxImpl_BASE ,public PropListener { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< ListControlHelper > mpListHelper; - SAL_WNODEPRECATED_DECLARATIONS_POP + std::unique_ptr< ListControlHelper > mpListHelper; OUString sSourceName; OUString msDftPropName; |