diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-24 13:09:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-24 14:56:13 +0000 |
| commit | 6f71fa11c0b1c5a9683c43bc98acec57a4d53610 (patch) | |
| tree | c5a47c553a02003903e2c98be64f249fde3678a4 /toolkit/source | |
| parent | 32cbe7125387397bf269fb6ca83c11cf66f9d543 (diff) | |
vcl makes no use of menu Get/Set DefaultItem
this is exposed through uno however, so move it into VCLXMenu to continue to
support it doing nothing of great value there
Change-Id: I6888e61cbec85faa2d1fcca8731ab42023e594c6
Diffstat (limited to 'toolkit/source')
| -rw-r--r-- | toolkit/source/awt/vclxmenu.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 2b98cc7436ae..45252bc718e4 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -40,12 +40,14 @@ VCLXMenu::VCLXMenu() : maMenuListeners( *this ) + , mnDefaultItem(0) { mpMenu = nullptr; } VCLXMenu::VCLXMenu( Menu* pMenu ) : maMenuListeners( *this ) + , mnDefaultItem(0) { mpMenu = pMenu; } @@ -476,20 +478,17 @@ void VCLXMenu::setDefaultItem( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) { - SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - if ( mpMenu ) - mpMenu->SetDefaultItem( nItemId ); + mnDefaultItem = nItemId; } sal_Int16 VCLXMenu::getDefaultItem( ) throw(css::uno::RuntimeException, std::exception) { - SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - return mpMenu ? mpMenu->GetDefaultItem() : 0; + return mnDefaultItem; } void VCLXMenu::checkItem( |