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

chart2: std::auto_ptr -> std::unique_ptr

Change-Id: Ia92c18858c8ed7cfc2765cc2310f3bf7bfd7e8df
üst e4c996d3
......@@ -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;
......
......@@ -74,7 +74,7 @@ public:
private:
::std::auto_ptr< impl::ImplObjectHierarchy > m_apImpl;
::std::unique_ptr< impl::ImplObjectHierarchy > m_apImpl;
};
class ObjectKeyNavigation
......
......@@ -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;
......
......@@ -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>
......
......@@ -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;
......
......@@ -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;
......
......@@ -73,7 +73,7 @@ private:
// member variables
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > m_xContext;
::std::auto_ptr< impl::ChartConfigItem > m_apChartConfigItem;
::std::unique_ptr< impl::ChartConfigItem > m_apChartConfigItem;
mutable ::com::sun::star::uno::Sequence< sal_Int64 > m_aColorSequence;
mutable sal_Int32 m_nNumberOfColors;
bool m_bNeedsUpdate;
......
......@@ -779,9 +779,7 @@ double VDataSeries::getYMeanValue() const
Symbol* getSymbolPropertiesFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< Symbol > apSymbolProps( new Symbol() );
SAL_WNODEPRECATED_DECLARATIONS_POP
::std::unique_ptr< Symbol > apSymbolProps( new Symbol() );
try
{
if( xProp->getPropertyValue("Symbol") >>= *apSymbolProps )
......@@ -927,9 +925,7 @@ uno::Reference<beans::XPropertySet> VDataSeries::getPropertiesOfSeries() const
DataPointLabel* getDataPointLabelFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< DataPointLabel > apLabel( new DataPointLabel() );
SAL_WNODEPRECATED_DECLARATIONS_POP
::std::unique_ptr< DataPointLabel > apLabel( new DataPointLabel() );
try
{
if( !(xProp->getPropertyValue(CHART_UNONAME_LABEL) >>= *apLabel) )
......
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