Kaydet (Commit) 91b61450 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in TitleDialogData

Change-Id: Idec568c868411056d1c8aa1a93c36008b223ce57
Reviewed-on: https://gerrit.libreoffice.org/59356
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 34b1a8c2
...@@ -27,11 +27,11 @@ namespace chart ...@@ -27,11 +27,11 @@ namespace chart
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2;
TitleDialogData::TitleDialogData( ReferenceSizeProvider* pRefSizeProvider ) TitleDialogData::TitleDialogData( std::unique_ptr<ReferenceSizeProvider> pRefSizeProvider )
: aPossibilityList(7) : aPossibilityList(7)
, aExistenceList(7) , aExistenceList(7)
, aTextList(7) , aTextList(7)
, apReferenceSizeProvider( pRefSizeProvider ) , apReferenceSizeProvider( std::move(pRefSizeProvider) )
{ {
for (sal_Int32 i = 0; i < 7; i++) for (sal_Int32 i = 0; i < 7; i++)
{ {
......
...@@ -418,7 +418,7 @@ private: ...@@ -418,7 +418,7 @@ private:
rtl::Reference<svx::sidebar::SelectionChangeHandler> mpSelectionChangeHandler; rtl::Reference<svx::sidebar::SelectionChangeHandler> mpSelectionChangeHandler;
bool impl_isDisposedOrSuspended() const; bool impl_isDisposedOrSuspended() const;
ReferenceSizeProvider* impl_createReferenceSizeProvider(); std::unique_ptr<ReferenceSizeProvider> impl_createReferenceSizeProvider();
void impl_adaptDataSeriesAutoResize(); void impl_adaptDataSeriesAutoResize();
void impl_createDrawViewController(); void impl_createDrawViewController();
......
...@@ -36,7 +36,7 @@ struct TitleDialogData ...@@ -36,7 +36,7 @@ struct TitleDialogData
css::uno::Sequence< OUString > aTextList; css::uno::Sequence< OUString > aTextList;
std::unique_ptr< ReferenceSizeProvider > apReferenceSizeProvider; 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 ); void readFromModel( const css::uno::Reference< css::frame::XModel >& xChartModel );
/* return true if anything has changed; /* return true if anything has changed;
......
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
#include <svx/svdundo.hxx> #include <svx/svdundo.hxx>
#include <svx/unoapi.hxx> #include <svx/unoapi.hxx>
#include <svx/unopage.hxx> #include <svx/unopage.hxx>
#include <o3tl/make_unique.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
...@@ -155,11 +156,11 @@ bool lcl_deleteDataCurve( ...@@ -155,11 +156,11 @@ bool lcl_deleteDataCurve(
} // anonymous namespace } // anonymous namespace
ReferenceSizeProvider* ChartController::impl_createReferenceSizeProvider() std::unique_ptr<ReferenceSizeProvider> ChartController::impl_createReferenceSizeProvider()
{ {
awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) ); awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) );
return new ReferenceSizeProvider( return o3tl::make_unique<ReferenceSizeProvider>(
aPageSize, Reference<chart2::XChartDocument>(getModel(), uno::UNO_QUERY)); aPageSize, Reference<chart2::XChartDocument>(getModel(), uno::UNO_QUERY));
} }
......
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