sw/source/uibase/dbui/mailmergehelper.cxx | 4 ++--
sw/source/uibase/inc/mailmergehelper.hxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5d6dc06db98385a8d4bb821f27df58b88e4bf25f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Oct 20 15:28:28 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Oct 21 15:21:51 2018 +0200
coverity#1440400 Resource leak in object
Change-Id: I96aea5e6004e8074630bdeeb7cbe4d16a46d5648
Reviewed-on: https://gerrit.libreoffice.org/62087
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
