[Libreoffice-commits] core.git: svx/source

[Matthew J. Francis]

 svx/source/tbxctrls/tbcontrl.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit edc52015c30dd58b4c79fb2642df3d1f1996d8b0
Author: Matthew J. Francis <mjay.francis at gmail.com>
Date:   Mon Aug 25 11:46:02 2014 +0800

    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 at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 881dcb9..f5a8091 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.