diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 11:19:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-12 13:04:37 +0200 |
| commit | 61dd9cafab20af893204deaca81ef26c1e7f7bb0 (patch) | |
| tree | 295d290223a484138c2bea2f7e000e274815794a /svx | |
| parent | e722564d40143fa029fe10d22a625539c795ee04 (diff) | |
make SvxEditSource::Clone return std::unique_ptr
Change-Id: If0d93024a642cc80a2a84d0c15525af1c0596546
Reviewed-on: https://gerrit.libreoffice.org/52715
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/AccessibleEmptyEditSource.cxx | 8 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleEmptyEditSource.hxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 19a09ec8f502..f42ba7221187 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -60,7 +60,7 @@ namespace accessibility SvxViewForwarder* GetViewForwarder() override; SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) override; - SvxEditSource* Clone() const override; + std::unique_ptr<SvxEditSource> Clone() const override; void UpdateData() override; @@ -82,7 +82,7 @@ namespace accessibility // SvxEditSource SvxTextForwarder* GetTextForwarder() override { return this; } SvxViewForwarder* GetViewForwarder() override { return this; } - SvxEditSource* Clone() const override { return nullptr; } + std::unique_ptr<SvxEditSource> Clone() const override { return nullptr; } void UpdateData() override {} SfxBroadcaster& GetBroadcaster() const override { return *const_cast<AccessibleEmptyEditSource_Impl*>(this); } @@ -190,7 +190,7 @@ namespace accessibility return maEditSource.GetEditViewForwarder( bCreate ); } - SvxEditSource* AccessibleProxyEditSource_Impl::Clone() const + std::unique_ptr<SvxEditSource> AccessibleProxyEditSource_Impl::Clone() const { return maEditSource.Clone(); } @@ -278,7 +278,7 @@ namespace accessibility return mpEditSource->GetEditViewForwarder( bCreate ); } - SvxEditSource* AccessibleEmptyEditSource::Clone() const + std::unique_ptr<SvxEditSource> AccessibleEmptyEditSource::Clone() const { if( !mpEditSource.get() ) return nullptr; diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx index 5fb7926c62ae..beb3bdae9f9d 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx @@ -56,7 +56,7 @@ namespace accessibility SvxTextForwarder* GetTextForwarder() override; SvxViewForwarder* GetViewForwarder() override; - SvxEditSource* Clone() const override; + std::unique_ptr<SvxEditSource> Clone() const override; // this method internally switches from empty to proxy mode, // creating an SvxTextEditSource for the functionality. diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index a90040b10a86..9fdefcbb5791 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -976,9 +976,9 @@ SvxTextEditSource::~SvxTextEditSource() } -SvxEditSource* SvxTextEditSource::Clone() const +std::unique_ptr<SvxEditSource> SvxTextEditSource::Clone() const { - return new SvxTextEditSource( mpImpl.get() ); + return std::unique_ptr<SvxEditSource>(new SvxTextEditSource( mpImpl.get() )); } |