diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-11 16:15:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-11 16:15:53 +0100 |
| commit | 576c7562ecf3d6d707c78d80852907c4a014178f (patch) | |
| tree | a417d5d4b541b77833083472bc492ae94f12c99b /sfx2 | |
| parent | 1e0e115d47e5874414ab511de8671d5bc466812c (diff) | |
Return std::unique_ptr from svt::AcceleratorExecute::createAcceleratorHelper
...to prevent errors like 5ac6e00274e732435b55c2908db9cea658fe549b "Memory leak"
Change-Id: I3e20393af628849d8a387b491b75e1aacdea982a
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index bd36eb322ed8..32e88518035f 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -442,7 +442,7 @@ bool BackingWindow::PreNotify( NotifyEvent& rNEvt ) // try the 'normal' accelerators (so that eg. Ctrl+Q works) if (!mpAccExec) { - mpAccExec.reset(svt::AcceleratorExecute::createAcceleratorHelper()); + mpAccExec = svt::AcceleratorExecute::createAcceleratorHelper(); mpAccExec->init( comphelper::getProcessComponentContext(), mxFrame); } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index e9af2f4201a6..e4c14a24e857 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1619,8 +1619,7 @@ bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) { if (!pImp->m_xAccExec.get()) { - pImp->m_xAccExec.reset( - ::svt::AcceleratorExecute::createAcceleratorHelper() ); + pImp->m_xAccExec = ::svt::AcceleratorExecute::createAcceleratorHelper(); pImp->m_xAccExec->init(::comphelper::getProcessComponentContext(), pFrame->GetFrame().GetFrameInterface()); } |