Kaydet (Commit) 75f25d00 authored tarafından Stephan Bergmann's avatar Stephan Bergmann Kaydeden (comit) David Tardon

Memory leak

(cherry picked from commit 5ac6e002)
Conflicts:
	sfx2/source/dialog/backingwindow.cxx

Change-Id: Ica40750d628946678019376d91db67ba3f9ed67e
Reviewed-on: https://gerrit.libreoffice.org/20601Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst e81d193d
......@@ -95,7 +95,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
mbIsSaveMode( false ),
mbInitControls( false ),
mnHideExternalLinks( 0 ),
mpAccExec( NULL ),
maSelTemplates(cmpSelectionItems),
maSelFolders(cmpSelectionItems)
......@@ -445,7 +444,7 @@ bool BackingWindow::Notify( 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);
}
const KeyEvent* pEvt = rNEvt.GetKeyEvent();
......
......@@ -44,6 +44,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XDesktop2.hpp>
#include <memory>
#include <set>
class ToolBox;
......@@ -91,7 +92,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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment