diff options
| author | Matthew J. Francis <mjay.francis@gmail.com> | 2014-08-25 11:46:02 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-25 05:28:21 -0500 |
| commit | edc52015c30dd58b4c79fb2642df3d1f1996d8b0 (patch) | |
| tree | 2a4a74c6b9aa6281524476d6b1de5d6c54e58acf | |
| parent | 48500bdd0571b11f56161579b576e37883f4c81d (diff) | |
fdo#82260 Fix OS X font dropdown crash
Without this, font dropdowns intermittently crash after a window
is moved to another screen
Change-Id: I1af5d8224fd164b73c43a9655fbde364f530c979
Reviewed-on: https://gerrit.libreoffice.org/11105
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 881dcb98e1a6..f5a80913f083 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -874,7 +874,8 @@ void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT); SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT)); } - else if ( rDCEvt.GetType() == DATACHANGED_FONTS ) + else if ( ( rDCEvt.GetType() == DATACHANGED_FONTS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY ) ) { // The old font list in shell has likely been destroyed at this point, so we need to get // the new one before doing anything further. |