diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-03 10:15:56 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-06 14:36:27 +0000 |
| commit | b73a8e115d9afaf7cc00906d158d1c2f1ba8829c (patch) | |
| tree | 8c148f0efa2ad36fb8798a10d069a90afc18f801 | |
| parent | 40affcbad618c02f06e8ec2ba031dda187fcd950 (diff) | |
Resolves: tdf#101470 don't restore last value when submenu appears
Change-Id: Ia0cce8607334289b619b1f59dbdd67b000a06e01
(cherry picked from commit b72593fac6addd571158bd37deccccb0045104a8)
Reviewed-on: https://gerrit.libreoffice.org/29475
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 4a94e8af786f..b711eb52c8ab 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -523,7 +523,7 @@ bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) else if ( MouseNotifyEvent::LOSEFOCUS == nType ) { // don't handle before our Select() is called - if ( !HasFocus() && !HasChildPathFocus() ) + if (!HasFocus() && !HasChildPathFocus() && !IsChild(rNEvt.GetWindow())) SetText( GetSavedValue() ); } return ComboBox::PreNotify( rNEvt ); |