svx/source/tbxctrls/tbcontrl.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b72593fac6addd571158bd37deccccb0045104a8
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Oct 3 10:15:56 2016 +0100
Resolves: tdf#101470 don't restore last value when submenu appears
Change-Id: Ia0cce8607334289b619b1f59dbdd67b000a06e01
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index bf0dd80..c12dcf6 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
