diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 08:20:36 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 10:33:24 +0200 |
commit | be31d107f5aa5e03b78772aaf67d8685b20965d1 (patch) | |
tree | 6b7d2471552b16ec6979414cdecfd4b5d5ff06d5 /chart2/source/controller | |
parent | e4c996d3627f95df693cb702451201c277f04b18 (diff) |
chart2: std::auto_ptr -> std::unique_ptr
Change-Id: Ia92c18858c8ed7cfc2765cc2310f3bf7bfd7e8df
Diffstat (limited to 'chart2/source/controller')
6 files changed, 10 insertions, 10 deletions
diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index 3cc9e10c2ce5..ea1579464455 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -85,7 +85,7 @@ public: private: mutable MarkHandleProvider* m_pMarkHandleProvider; - ::std::auto_ptr< SdrOutliner > m_apOutliner; + ::std::unique_ptr< SdrOutliner > m_apOutliner; // #i79965# scroll back view when ending text edit bool m_bRestoreMapMode; diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx index f0c02c17f91b..67e4fcf8a485 100644 --- a/chart2/source/controller/inc/ObjectHierarchy.hxx +++ b/chart2/source/controller/inc/ObjectHierarchy.hxx @@ -74,7 +74,7 @@ public: private: - ::std::auto_ptr< impl::ImplObjectHierarchy > m_apImpl; + ::std::unique_ptr< impl::ImplObjectHierarchy > m_apImpl; }; class ObjectKeyNavigation diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index 8f4dd54c84cc..8b3529b9d9e1 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -63,8 +63,8 @@ protected: m_xChartDocument; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::std::auto_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider; - ::std::auto_ptr< DialogModel > m_apDialogModel; + ::std::unique_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider; + ::std::unique_ptr< DialogModel > m_apDialogModel; private: DataSourceTabControl* m_pTabControl; diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 717c98b1920a..bed1daa3bc14 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -67,7 +67,7 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -// this is needed to properly destroy the auto_ptr to the AcceleratorExecute +// this is needed to properly destroy the unique_ptr to the AcceleratorExecute // object in the DTOR #include <svtools/acceleratorexecute.hxx> #include <svx/ActionDescriptionProvider.hxx> diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 469dee216b76..4613fdd6e69d 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -515,15 +515,15 @@ private: bool m_bConnectingToView; ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; - ::std::auto_ptr< UndoGuard > m_pTextActionUndoGuard; + ::std::unique_ptr< UndoGuard > m_pTextActionUndoGuard; /// needed for dispatching URLs in FeatureStateEvents mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - ::std::auto_ptr< ::svt::AcceleratorExecute > m_apAccelExecute; + ::std::unique_ptr< ::svt::AcceleratorExecute > m_apAccelExecute; CommandDispatchContainer m_aDispatchContainer; - ::std::auto_ptr< DropTargetHelper > m_apDropTargetHelper; + ::std::unique_ptr< DropTargetHelper > m_apDropTargetHelper; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerEventBroadcaster > m_xLayoutManagerEventBroadcaster; diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index cb23be2d1a20..049c0f20ce9a 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -113,8 +113,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xDispatch; - ::std::auto_ptr< impl::ModelState > m_apModelState; - ::std::auto_ptr< impl::ControllerState > m_apControllerState; + ::std::unique_ptr< impl::ModelState > m_apModelState; + ::std::unique_ptr< impl::ControllerState > m_apControllerState; mutable ::std::map< OUString, bool > m_aCommandAvailability; mutable ::std::map< OUString, ::com::sun::star::uno::Any > m_aCommandArguments; |