diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-01-15 13:24:50 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-15 20:29:35 +0100 |
commit | 160cde8ec0473b4a0c8e15ee13520d83171aea8d (patch) | |
tree | 32674ff800bb19a4ae1492888e6573e8fd08f98c /sfx2/source | |
parent | c34edadf5bd3d1d9f3c9c056af28b8964d8f1ca0 (diff) |
no remaining CreatePopupWindow returns non-null
Change-Id: Ie342bd24222f622997d8dc2cda51ecb908fdb047
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86843
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 0e9aba25830f..04cc9dee983c 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -547,11 +547,8 @@ void SAL_CALL SfxToolBoxControl::doubleClick() Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() { SolarMutexGuard aGuard; - VclPtr<vcl::Window> pWindow = CreatePopupWindow(); - if ( pWindow ) - return VCLUnoHelper::GetInterface( pWindow ); - else - return Reference< css::awt::XWindow >(); + CreatePopupWindow(); + return nullptr; } Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createItemWindow( const Reference< css::awt::XWindow >& rParent ) @@ -669,10 +666,8 @@ void SfxToolBoxControl::Click() { } - -VclPtr<SfxPopupWindow> SfxToolBoxControl::CreatePopupWindow() +void SfxToolBoxControl::CreatePopupWindow() { - return nullptr; } VclPtr<vcl::Window> SfxToolBoxControl::CreateItemWindow( vcl::Window * ) |