summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-03 10:15:56 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-03 10:17:26 +0100
commitb72593fac6addd571158bd37deccccb0045104a8 (patch)
treedeba646e9f5fa23f40d05faf4cdae2be580a51d6
parentc7114b66bd615670950ef6f7c2d80adab3fb4c33 (diff)
Resolves: tdf#101470 don't restore last value when submenu appears
Change-Id: Ia0cce8607334289b619b1f59dbdd67b000a06e01
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index bf0dd8031620..c12dcf6c6030 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 );