diff options
12 files changed, 20 insertions, 20 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 4d5e1d89ae7f..9ce465b70613 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -297,8 +297,8 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments MutexGuard aGuard( m_aMutex); Reference< chart2::XChartDocument > xChartDoc( xChartModel, uno::UNO_QUERY ); if( xChartDoc.is()) - m_spObjectHierarchy.reset( - new ObjectHierarchy( xChartDoc, comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(m_xChartView) )); + m_spObjectHierarchy = + std::make_shared<ObjectHierarchy>( xChartDoc, comphelper::getUnoTunnelImplementation<ExplicitValueProvider>(m_xChartView) ); else m_spObjectHierarchy.reset(); } diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 74b0bf7bb65c..593ac535338d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -639,7 +639,7 @@ Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPro ChartDocumentWrapper::ChartDocumentWrapper( const Reference< uno::XComponentContext > & xContext ) : - m_spChart2ModelContact( new Chart2ModelContact( xContext ) ), + m_spChart2ModelContact( std::make_shared<Chart2ModelContact>( xContext ) ), m_bUpdateAddIn( true ), m_bIsDisposed( false ) { diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 7d293852857f..cbfb03b50031 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -851,9 +851,9 @@ void DataBrowser::SetDataFromModel( m_xChartDoc.set( xChartDoc ); m_apDataBrowserModel.reset( new DataBrowserModel( m_xChartDoc, xContext )); - m_spNumberFormatterWrapper.reset( - new NumberFormatterWrapper( - Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY ))); + m_spNumberFormatterWrapper = + std::make_shared<NumberFormatterWrapper>( + Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY )); m_aNumberEditField->SetFormatter( m_spNumberFormatterWrapper->getSvNumberFormatter() ); diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index cdd1a187d766..6dc9201bc61f 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -395,8 +395,8 @@ std::shared_ptr< RangeSelectionHelper > const & DialogModel::getRangeSelectionHelper() const { if( ! m_spRangeSelectionHelper.get()) - m_spRangeSelectionHelper.reset( - new RangeSelectionHelper( m_xChartDocument )); + m_spRangeSelectionHelper = + std::make_shared<RangeSelectionHelper>( m_xChartDocument ); return m_spRangeSelectionHelper; } diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index 580b81e11190..ec37591200c0 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -84,7 +84,7 @@ ErrorBarItemConverter::ErrorBarItemConverter( SdrModel& rDrawModel, const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ) : ItemConverter( rPropertySet, rItemPool ), - m_spGraphicConverter( new GraphicPropertyItemConverter( + m_spGraphicConverter( std::make_shared<GraphicPropertyItemConverter>( rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, GraphicObjectType::LineProperties )), diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index f2ee1d4cbfce..482c48e8efbe 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -90,7 +90,7 @@ RegressionCurveItemConverter::RegressionCurveItemConverter( SdrModel& rDrawModel, const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ) : ItemConverter( rPropertySet, rItemPool ), - m_spGraphicConverter( new GraphicPropertyItemConverter( + m_spGraphicConverter( std::make_shared<GraphicPropertyItemConverter>( rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, GraphicObjectType::LineProperties )), diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index b173332c9ed4..91687aebd28f 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -41,7 +41,7 @@ UndoGuard::UndoGuard( const OUString& i_undoString, const uno::Reference< docume ,m_aUndoString( i_undoString ) ,m_bActionPosted( false ) { - m_pDocumentSnapshot.reset( new ChartModelClone( m_xChartModel, i_facet ) ); + m_pDocumentSnapshot = std::make_shared<ChartModelClone>( m_xChartModel, i_facet ); } UndoGuard::~UndoGuard() diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 530ea060f390..c25492e91ef1 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2167,7 +2167,7 @@ std::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType return apVTitle; //create title - apVTitle.reset(new VTitle(xTitle)); + apVTitle = std::make_shared<VTitle>(xTitle); OUString aCID = ObjectIdentifier::createClassifiedIdentifierForObject(xTitle, rModel); apVTitle->init(xPageShapes, xShapeFactory, aCID); apVTitle->createShapes(awt::Point(0,0), rPageSize); @@ -2969,7 +2969,7 @@ void ChartView::createShapes2D( const awt::Size& rPageSize ) if (aParam.maRemainingSpace.Width <= 0|| aParam.maRemainingSpace.Height <= 0) return; - aParam.mpSeriesPlotterContainer.reset(new SeriesPlotterContainer(m_aVCooSysList)); + aParam.mpSeriesPlotterContainer = std::make_shared<SeriesPlotterContainer>(m_aVCooSysList); aParam.mpSeriesPlotterContainer->initializeCooSysAndSeriesPlotter( mrChartModel ); if(maTimeBased.bTimeBased && maTimeBased.nFrame != 0) { diff --git a/comphelper/source/misc/DirectoryHelper.cxx b/comphelper/source/misc/DirectoryHelper.cxx index a659421654b3..fa5380d425dd 100644 --- a/comphelper/source/misc/DirectoryHelper.cxx +++ b/comphelper/source/misc/DirectoryHelper.cxx @@ -46,7 +46,7 @@ bool DirectoryHelper::fileExists(const OUString& rBaseURL) { if (!rBaseURL.isEmpty()) { - FileSharedPtr aBaseFile(new osl::File(rBaseURL)); + FileSharedPtr aBaseFile = std::make_shared<osl::File>(rBaseURL); return (osl::File::E_None == aBaseFile->open(osl_File_OpenFlag_Read)); } diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx index ffbcb1386222..e58fe768f15b 100644 --- a/comphelper/source/misc/backupfilehelper.cxx +++ b/comphelper/source/misc/backupfilehelper.cxx @@ -1166,7 +1166,7 @@ namespace maPackedFileEntryVector(), mbChanged(false) { - FileSharedPtr aSourceFile(new osl::File(rURL)); + FileSharedPtr aSourceFile = std::make_shared<osl::File>(rURL); if (osl::File::E_None == aSourceFile->open(osl_File_OpenFlag_Read)) { @@ -2083,7 +2083,7 @@ namespace comphelper { const OUString aPackURL(createPackURL(rTargetURL, rName)); PackedFile aPackedFile(aPackURL); - FileSharedPtr aBaseFile(new osl::File(aFileURL)); + FileSharedPtr aBaseFile = std::make_shared<osl::File>(aFileURL); if (aPackedFile.tryPush(aBaseFile, mbCompress)) { @@ -2284,7 +2284,7 @@ namespace comphelper { const OUString aPackURL(createPackURL(rTargetURL, "ExtensionInfo")); PackedFile aPackedFile(aPackURL); - FileSharedPtr aBaseFile(new osl::File(aTempURL)); + FileSharedPtr aBaseFile = std::make_shared<osl::File>(aTempURL); if (aPackedFile.tryPush(aBaseFile, mbCompress)) { @@ -2336,7 +2336,7 @@ namespace comphelper { // last config is in temp file, load it to ExtensionInfo ExtensionInfo aLoadedExtensionInfo; - FileSharedPtr aBaseFile(new osl::File(aTempURL)); + FileSharedPtr aBaseFile = std::make_shared<osl::File>(aTempURL); if (osl::File::E_None == aBaseFile->open(osl_File_OpenFlag_Read)) { diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index 4054222c855d..405a4acaeb68 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.cxx @@ -65,7 +65,7 @@ namespace comphelper } EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const char* _pAsciiLoggerName ) - :m_pImpl( new EventLogger_Impl( _rxContext, OUString::createFromAscii( _pAsciiLoggerName ) ) ) + :m_pImpl( std::make_shared<EventLogger_Impl>( _rxContext, OUString::createFromAscii( _pAsciiLoggerName ) ) ) { } diff --git a/comphelper/source/misc/sharedmutex.cxx b/comphelper/source/misc/sharedmutex.cxx index 176c8acaa7f2..58ae35df5924 100644 --- a/comphelper/source/misc/sharedmutex.cxx +++ b/comphelper/source/misc/sharedmutex.cxx @@ -26,7 +26,7 @@ namespace comphelper { SharedMutex::SharedMutex() - :m_pMutexImpl( new ::osl::Mutex ) + :m_pMutexImpl( std::make_shared<::osl::Mutex >()) { } |