[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svx/source

[David Tardon]

 svx/source/tbxctrls/tbcontrl.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 5f955c65e253d72bff91b7f38bca62f2fcf25f4f
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jul 25 15:40:27 2014 +0200

    rhbz#1121254 reload font list from shell on change
    
    Change-Id: Ief88373c210b3b6f65c1df5b31870aca561095bb
    (cherry picked from commit 0497864bd4f603605997938d504ef9598623e713)
    Reviewed-on: https://gerrit.libreoffice.org/10547
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index bf18eca..638c179 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -945,6 +945,12 @@ 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 )
+    {
+        // 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.
+        lcl_GetDocFontList( &pFontList, this );
+    }
 
     FontNameBox::DataChanged( rDCEvt );
 }