diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-09-28 13:06:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-09-28 13:07:03 +0200 |
| commit | d5b87dcce119f0cd69e65873833d98ed1660f9d0 (patch) | |
| tree | 8cb637f751eef1225487f7a38fefd84b22b5d44d /dbaccess | |
| parent | 94ed449247e2256d4163fb4a46b4be2c3f498d60 (diff) | |
Return std::unique_ptr from SvTreeListBox::CreateContextMenu
Change-Id: I1e4c32099ec9741c0cab246eb627a2eb3b933e1a
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbtreelistbox.hxx | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index cd213baa4a3e..8535e7bcbbfc 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -561,12 +561,12 @@ namespace } } -PopupMenu* DBTreeListBox::CreateContextMenu() +std::unique_ptr<PopupMenu> DBTreeListBox::CreateContextMenu() { ::std::unique_ptr< PopupMenu > pContextMenu; if ( !m_pContextMenuProvider ) - return pContextMenu.release(); + return pContextMenu; // the basic context menu pContextMenu.reset( m_pContextMenuProvider->getContextMenu( *this ) ); @@ -577,7 +577,7 @@ PopupMenu* DBTreeListBox::CreateContextMenu() // allow context menu interception ::cppu::OInterfaceContainerHelper* pInterceptors = m_pContextMenuProvider->getContextMenuInterceptors(); if ( !pInterceptors || !pInterceptors->getLength() ) - return pContextMenu.release(); + return pContextMenu; ContextMenuExecuteEvent aEvent; aEvent.SourceWindow = VCLUnoHelper::GetInterface( this ); @@ -642,7 +642,7 @@ PopupMenu* DBTreeListBox::CreateContextMenu() lcl_adjustMenuItemIDs( *pModifiedMenu, m_pContextMenuProvider->getCommandController() ); } - return pContextMenu.release(); + return pContextMenu; } void DBTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 9e6c42b3aedc..edabc325869e 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -27,6 +27,7 @@ #include <svtools/treelistbox.hxx> #include <vcl/timer.hxx> +#include <memory> #include <set> namespace dbaui @@ -114,7 +115,7 @@ namespace dbaui virtual bool DoubleClickHdl() SAL_OVERRIDE; - virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; + virtual std::unique_ptr<PopupMenu> CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; void SetEnterKeyHdl(const Link<DBTreeListBox*,void>& rNewHdl) {m_aEnterKeyHdl = rNewHdl;} |