summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc/mailmergehelper.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/inc/mailmergehelper.hxx')
-rw-r--r--sw/source/uibase/inc/mailmergehelper.hxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index c6691af3dcc1..deb715c98e79 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -60,7 +60,7 @@ struct SwAddressPreview_Impl;
// and also the resulting address filled with database data
class SW_DLLPUBLIC SwAddressPreview : public vcl::Window
{
- ScrollBar aVScrollBar;
+ VclPtr<ScrollBar> aVScrollBar;
SwAddressPreview_Impl* pImpl;
Link m_aSelectHdl;
@@ -77,6 +77,8 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window
public:
SwAddressPreview(vcl::Window* pParent, WinBits nStyle=WB_BORDER);
+ virtual ~SwAddressPreview();
+ virtual void dispose() SAL_OVERRIDE;
void positionScrollBar();
@@ -140,7 +142,7 @@ class SW_DLLPUBLIC SwAuthenticator :
{
OUString m_aUserName;
OUString m_aPassword;
- vcl::Window* m_pParentWindow;
+ VclPtr<vcl::Window> m_pParentWindow;
public:
SwAuthenticator() : m_pParentWindow(0) {}
SwAuthenticator(const OUString& username, const OUString& password, vcl::Window* pParent) :