diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 15:20:07 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 15:20:22 +0200 |
commit | dc635425118c77d35534d1bf8b3aa12a1ad95752 (patch) | |
tree | 266c8b6b45110eccfe4c8cac375e0eb0ffde3db9 /include/svx | |
parent | d3de12fcfc85feb36eda3b0495807ef11d8fe772 (diff) |
svx: std::auto_ptr -> std::unique_ptr
Change-Id: Ib70d974817bcdd9a582e9be28d28b007cdc3a7a7
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/AccessibleTextHelper.hxx | 2 | ||||
-rw-r--r-- | include/svx/databaselocationinput.hxx | 2 | ||||
-rw-r--r-- | include/svx/dialcontrol.hxx | 2 | ||||
-rw-r--r-- | include/svx/fmshell.hxx | 2 | ||||
-rw-r--r-- | include/svx/frmsel.hxx | 2 | ||||
-rw-r--r-- | include/svx/orienthelper.hxx | 2 | ||||
-rw-r--r-- | include/svx/shapepropertynotifier.hxx | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 8d13e9d6236d..2534976470b1 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -411,7 +411,7 @@ namespace accessibility private: /// @dyn - const std::auto_ptr< AccessibleTextHelper_Impl > mpImpl; + const std::unique_ptr< AccessibleTextHelper_Impl > mpImpl; }; diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx index b5af04f558a4..373305c71fda 100644 --- a/include/svx/databaselocationinput.hxx +++ b/include/svx/databaselocationinput.hxx @@ -74,7 +74,7 @@ namespace svx bool prepareCommit(); private: - ::std::auto_ptr< DatabaseLocationInputController_Impl > + ::std::unique_ptr< DatabaseLocationInputController_Impl > m_pImpl; }; diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 800bb1a90f1e..46ca48af47eb 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -147,7 +147,7 @@ protected: void Init( const Size& rWinSize, const vcl::Font& rWinFont ); void SetSize( const Size& rWinSize ); }; - std::auto_ptr< DialControl_Impl > mpImpl; + std::unique_ptr< DialControl_Impl > mpImpl; virtual void HandleMouseEvent( const Point& rPos, bool bInitial ); virtual void HandleEscapeEvent(); diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 1d1309854a0e..63f96a747bf7 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -159,7 +159,7 @@ public: OutputDevice& i_rDevice ) const; - ::std::auto_ptr< ::svx::ISdrObjectFilter > + ::std::unique_ptr< ::svx::ISdrObjectFilter > CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 29d1ddfbfbfc..e92271b44d06 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -190,7 +190,7 @@ protected: virtual Size GetOptimalSize() const SAL_OVERRIDE; private: - std::auto_ptr< FrameSelectorImpl > mxImpl; + std::unique_ptr< FrameSelectorImpl > mxImpl; }; diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index c7946c94c16d..a830c1bed9eb 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -89,7 +89,7 @@ public: void EnableStackedTriState( bool bEnable = true ); private: - std::auto_ptr< OrientationHelper_Impl > mpImpl; + std::unique_ptr< OrientationHelper_Impl > mpImpl; }; diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index a1ebfe12f9ca..5d9f90b56b50 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -129,7 +129,7 @@ namespace svx void disposing(); private: - ::std::auto_ptr< PropertyChangeNotifier_Data > m_pData; + ::std::unique_ptr< PropertyChangeNotifier_Data > m_pData; }; |