Kaydet (Commit) 0b23ac2c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

vbahelper: std::auto_ptr -> std::unique_ptr

Change-Id: Ic1b28e7f79cc7dad6a045eb64e5191991533990d
üst b78b1434
...@@ -173,7 +173,7 @@ public: ...@@ -173,7 +173,7 @@ public:
class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes : public AbstractGeometryAttributes class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes : public AbstractGeometryAttributes
{ {
std::auto_ptr< ShapeHelper > m_pShapeHelper; std::unique_ptr< ShapeHelper > m_pShapeHelper;
public: public:
ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape ); ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
virtual double getLeft() const SAL_OVERRIDE; virtual double getLeft() const SAL_OVERRIDE;
......
...@@ -37,9 +37,7 @@ typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE; ...@@ -37,9 +37,7 @@ typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE;
class VBAHELPER_DLLPUBLIC ScVbaShape : public ScVbaShape_BASE class VBAHELPER_DLLPUBLIC ScVbaShape : public ScVbaShape_BASE
{ {
protected: protected:
SAL_WNODEPRECATED_DECLARATIONS_PUSH std::unique_ptr< ov::ShapeHelper > m_pShapeHelper;
std::auto_ptr< ov::ShapeHelper > m_pShapeHelper;
SAL_WNODEPRECATED_DECLARATIONS_POP
css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::drawing::XShape > m_xShape;
css::uno::Reference< css::drawing::XShapes > m_xShapes; css::uno::Reference< css::drawing::XShapes > m_xShapes;
css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE; typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE;
class ScVbaComboBox : public ComboBoxImpl_BASE class ScVbaComboBox : public ComboBoxImpl_BASE
{ {
std::auto_ptr< ListControlHelper > mpListHelper; std::unique_ptr< ListControlHelper > mpListHelper;
OUString sSourceName; OUString sSourceName;
OUString msDftPropName; OUString msDftPropName;
......
...@@ -611,7 +611,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R ...@@ -611,7 +611,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R
xProps->getPropertyValue( "ClassId" ) >>= nClassId; xProps->getPropertyValue( "ClassId" ) >>= nClassId;
uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
uno::Reference< drawing::XShape > xShape( xControlShape, uno::UNO_QUERY_THROW ); 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 ) switch( nClassId )
{ {
case form::FormComponentType::COMBOBOX: case form::FormComponentType::COMBOBOX:
...@@ -656,7 +656,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R ...@@ -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< lang::XServiceInfo > xServiceInfo( xProps, uno::UNO_QUERY_THROW );
uno::Reference< msforms::XControl > xVBAControl; uno::Reference< msforms::XControl > xVBAControl;
uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess 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" ) ) if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) )
xVBAControl.set( new ScVbaCheckbox( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) ); xVBAControl.set( new ScVbaCheckbox( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) );
......
...@@ -49,7 +49,7 @@ protected: ...@@ -49,7 +49,7 @@ protected:
bool bIsDialog; bool bIsDialog;
OUString m_sLibraryAndCodeName; 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::beans::XPropertySet > m_xProps;
css::uno::Reference< css::uno::XInterface > m_xControl; css::uno::Reference< css::uno::XInterface > m_xControl;
css::uno::Reference< css::frame::XModel > m_xModel; css::uno::Reference< css::frame::XModel > m_xModel;
......
...@@ -33,9 +33,7 @@ typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::s ...@@ -33,9 +33,7 @@ typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::s
class ScVbaListBox : public ListBoxImpl_BASE class ScVbaListBox : public ListBoxImpl_BASE
,public PropListener ,public PropListener
{ {
SAL_WNODEPRECATED_DECLARATIONS_PUSH std::unique_ptr< ListControlHelper > mpListHelper;
std::auto_ptr< ListControlHelper > mpListHelper;
SAL_WNODEPRECATED_DECLARATIONS_POP
OUString sSourceName; OUString sSourceName;
OUString msDftPropName; OUString msDftPropName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment