diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 09:56:54 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 09:57:16 +0200 |
commit | eba71a4937036bd2e1101a060a28a1ec45f702bf (patch) | |
tree | ecf338be85d303e0b774dc80169a775bd2bb6abe /include | |
parent | e653fbfbfa41ec46431b84e50ac6f054e8713601 (diff) |
sfx2: std::auto_ptr -> std::unique_ptr
Change-Id: I7bac4105494cdbbadd4c4d78ce1fcf03b8ccae6c
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/DocumentMetadataAccess.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/controlwrapper.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/itemconnect.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/opengrf.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/securitypage.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/userinputinterception.hxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx index e0cea2749346..8178b59fa99e 100644 --- a/include/sfx2/DocumentMetadataAccess.hxx +++ b/include/sfx2/DocumentMetadataAccess.hxx @@ -198,7 +198,7 @@ public: ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; private: - std::auto_ptr<DocumentMetadataAccess_Impl> m_pImpl; + std::unique_ptr<DocumentMetadataAccess_Impl> m_pImpl; }; } // namespace sfx2 diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 447bf5cb54d3..91b79b04f396 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -452,7 +452,7 @@ public: virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; private: - std::auto_ptr< MultiControlWrapperHelper_Impl > mxImpl; + std::unique_ptr< MultiControlWrapperHelper_Impl > mxImpl; }; diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index a0f2eb6d78df..79fce0c4c5dd 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -243,8 +243,8 @@ public: typedef typename ControlWrpT::ControlType ControlType; typedef typename ControlWrpT::ControlValueType ControlValueType; - typedef std::auto_ptr< ItemWrpT > ItemWrapperRef; - typedef std::auto_ptr< ControlWrpT > ControlWrapperRef; + typedef std::unique_ptr< ItemWrpT > ItemWrapperRef; + typedef std::unique_ptr< ControlWrpT > ControlWrapperRef; /** Receives pointer to a newly created control wrapper. @descr Takes ownership of the control wrapper. */ @@ -454,7 +454,7 @@ protected: virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; private: - std::auto_ptr< ItemConnectionArrayImpl > mxImpl; + std::unique_ptr< ItemConnectionArrayImpl > mxImpl; }; diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx index 83cce38846be..a38d8800a4bd 100644 --- a/include/sfx2/opengrf.hxx +++ b/include/sfx2/opengrf.hxx @@ -50,7 +50,7 @@ private: SFX2_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&); SFX2_DLLPRIVATE SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & ); - const std::auto_ptr< SvxOpenGrf_Impl > mpImpl; + const std::unique_ptr< SvxOpenGrf_Impl > mpImpl; }; #endif // _SVX_OPENGRF_HXX diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index eecaf318ab0a..2777088ddc60 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -30,7 +30,7 @@ struct SfxSecurityPage_Impl; class SfxSecurityPage : public SfxTabPage { - std::auto_ptr< SfxSecurityPage_Impl > m_pImpl; + std::unique_ptr< SfxSecurityPage_Impl > m_pImpl; protected: SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx index 5825ac1d7d86..539cdb1c8eb5 100644 --- a/include/sfx2/userinputinterception.hxx +++ b/include/sfx2/userinputinterception.hxx @@ -63,7 +63,7 @@ namespace sfx2 bool handleNotifyEvent( const NotifyEvent& _rEvent ); private: - ::std::auto_ptr< UserInputInterception_Data > m_pData; + ::std::unique_ptr< UserInputInterception_Data > m_pData; }; |