diff options
author | David Tardon <dtardon@redhat.com> | 2014-07-25 15:40:27 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-07-29 15:50:14 +0000 |
commit | 5f955c65e253d72bff91b7f38bca62f2fcf25f4f (patch) | |
tree | d37c7ad7f49d9862c2390389122407731efedcc3 | |
parent | 24801a6a9c767459c7a2e5e4176c0a809f08422c (diff) |
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@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index bf18eca941f3..638c1797d05c 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 ); } |