diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-20 13:48:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-21 12:10:42 +0200 |
| commit | 91b6145090e6e5194493ac7e7dfb3b4096df906f (patch) | |
| tree | 7829bb9069708e056fb616115c93efd17088f885 /chart2 | |
| parent | 34b1a8c2c75f32f0c352acb4f1fd9fd3c2ff00cb (diff) | |
loplugin:useuniqueptr in TitleDialogData
Change-Id: Idec568c868411056d1c8aa1a93c36008b223ce57
Reviewed-on: https://gerrit.libreoffice.org/59356
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
4 files changed, 7 insertions, 6 deletions
diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index e859ffceb2b5..907bc7324fda 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -27,11 +27,11 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -TitleDialogData::TitleDialogData( ReferenceSizeProvider* pRefSizeProvider ) +TitleDialogData::TitleDialogData( std::unique_ptr<ReferenceSizeProvider> pRefSizeProvider ) : aPossibilityList(7) , aExistenceList(7) , aTextList(7) - , apReferenceSizeProvider( pRefSizeProvider ) + , apReferenceSizeProvider( std::move(pRefSizeProvider) ) { for (sal_Int32 i = 0; i < 7; i++) { diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index 2cf1978811db..b6c9db260d15 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -418,7 +418,7 @@ private: rtl::Reference<svx::sidebar::SelectionChangeHandler> mpSelectionChangeHandler; bool impl_isDisposedOrSuspended() const; - ReferenceSizeProvider* impl_createReferenceSizeProvider(); + std::unique_ptr<ReferenceSizeProvider> impl_createReferenceSizeProvider(); void impl_adaptDataSeriesAutoResize(); void impl_createDrawViewController(); diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index 634ed5b76138..6deeb2050b1d 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -36,7 +36,7 @@ struct TitleDialogData css::uno::Sequence< OUString > aTextList; std::unique_ptr< ReferenceSizeProvider > apReferenceSizeProvider; - TitleDialogData(ReferenceSizeProvider* pReferenzeSizeProvider = nullptr); + TitleDialogData(std::unique_ptr<ReferenceSizeProvider> pReferenzeSizeProvider = nullptr); void readFromModel( const css::uno::Reference< css::frame::XModel >& xChartModel ); /* return true if anything has changed; diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index a8269b760edf..90cc52855380 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -69,6 +69,7 @@ #include <svx/svdundo.hxx> #include <svx/unoapi.hxx> #include <svx/unopage.hxx> +#include <o3tl/make_unique.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <tools/diagnose_ex.h> @@ -155,11 +156,11 @@ bool lcl_deleteDataCurve( } // anonymous namespace -ReferenceSizeProvider* ChartController::impl_createReferenceSizeProvider() +std::unique_ptr<ReferenceSizeProvider> ChartController::impl_createReferenceSizeProvider() { awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) ); - return new ReferenceSizeProvider( + return o3tl::make_unique<ReferenceSizeProvider>( aPageSize, Reference<chart2::XChartDocument>(getModel(), uno::UNO_QUERY)); } |