diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-20 15:00:03 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:01:48 +0100 |
| commit | d1091fd50adb1c01d1b1393fd662278611f9e7e1 (patch) | |
| tree | db279bb0b9641b8e912c55d72ce4a9a7ccb2f4b5 /sd/source | |
| parent | 58a43332b3a86db3756e6ad18e31189969c85364 (diff) | |
re-insert erroneously converted delete calls.
Change-Id: Iebdf2af3866d884289f6913646106fe3f2d4dde5
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/dlg/sddlgfact.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fupoor.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index b7fe5347e91a..3ba9b486d787 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -23,7 +23,7 @@ #include <sfx2/basedlgs.hxx> #define DECL_ABSTDLG_BASE(Class,DialogClass) \ - VclPtr<DialogClass> pDlg; \ + ScopedVclPtr<DialogClass> pDlg; \ public: \ Class( DialogClass* p) \ : pDlg(p) \ diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index f3d94ef85579..9d1da08682a6 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -100,7 +100,8 @@ FuPoor::~FuPoor() { aDragTimer.Stop(); aScrollTimer.Stop(); - aDelayToScrollTimer.Stop (); + aDelayToScrollTimer.Stop(); + pDialog.disposeAndClear(); } void FuPoor::Activate() |