diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-20 15:28:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-21 15:21:51 +0200 |
| commit | 5d6dc06db98385a8d4bb821f27df58b88e4bf25f (patch) | |
| tree | 31ccc2667ec95044358e8485a46c66373897551d | |
| parent | 0de0b8c9d80d68619b6f3c0e8d9429d8b08553fb (diff) | |
coverity#1440400 Resource leak in object
Change-Id: I96aea5e6004e8074630bdeeb7cbe4d16a46d5648
Reviewed-on: https://gerrit.libreoffice.org/62087
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/uibase/dbui/mailmergehelper.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/inc/mailmergehelper.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 26f9489dd346..20f040ab03be 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -545,8 +545,8 @@ OUString SwAddressPreview::FillData( } AddressPreview::AddressPreview(std::unique_ptr<weld::ScrolledWindow> xWindow) - : m_xVScrollBar(std::move(xWindow)) - , pImpl(new SwAddressPreview_Impl()) + : pImpl(new SwAddressPreview_Impl()) + , m_xVScrollBar(std::move(xWindow)) { m_xVScrollBar->set_user_managed_scrolling(); m_xVScrollBar->connect_vadjustment_changed(LINK(this, AddressPreview, ScrollHdl)); diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index 3d3a0d199be6..575c4f679bc2 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -115,8 +115,8 @@ public: class SW_DLLPUBLIC AddressPreview : public weld::CustomWidgetController { + std::unique_ptr<SwAddressPreview_Impl> pImpl; std::unique_ptr<weld::ScrolledWindow> m_xVScrollBar; - SwAddressPreview_Impl* pImpl; Link<LinkParamNone*,void> m_aSelectHdl; void DrawText_Impl(vcl::RenderContext& rRenderContext, const OUString& rAddress, |