diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 13:38:52 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-12-10 16:14:50 +0100 |
| commit | fbff9f884dbf5aa1dc962d5b608c6ae1941a50ff (patch) | |
| tree | 9e43358efa27c1ecff9cbcf81c81580590cda333 /sfx2 | |
| parent | 70ba21c385c9afb65c2183a26c5b7af2a8dfd477 (diff) | |
Memory leak
(cherry picked from commit 5ac6e00274e732435b55c2908db9cea658fe549b)
Conflicts:
sfx2/source/dialog/backingwindow.cxx
Change-Id: Ica40750d628946678019376d91db67ba3f9ed67e
Reviewed-on: https://gerrit.libreoffice.org/20601
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 75f25d00848068c677fca450d35aa59af0422c60)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/dialog/backingwindow.hxx | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 5686c434d27a..2c0d8c0dda79 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -96,7 +96,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) : mbIsSaveMode( false ), mbInitControls( false ), mnHideExternalLinks( 0 ), - mpAccExec( NULL ), maSelTemplates(cmpSelectionItems), maSelFolders(cmpSelectionItems) @@ -443,7 +442,7 @@ bool BackingWindow::PreNotify( NotifyEvent& rNEvt ) // try the 'normal' accelerators (so that eg. Ctrl+Q works) if (!mpAccExec) { - mpAccExec = svt::AcceleratorExecute::createAcceleratorHelper(); + mpAccExec.reset(svt::AcceleratorExecute::createAcceleratorHelper()); mpAccExec->init( comphelper::getProcessComponentContext(), mxFrame); } diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 8dfa84f43e46..313361d01047 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -44,6 +44,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDesktop2.hpp> +#include <memory> #include <set> class ToolBox; @@ -92,7 +93,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer bool mbIsSaveMode; bool mbInitControls; sal_Int32 mnHideExternalLinks; - svt::AcceleratorExecute* mpAccExec; + std::unique_ptr<svt::AcceleratorExecute> mpAccExec; void setupButton(PushButton* pButton); void setupButton(MenuButton* pButton); |