summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-07-25 15:40:27 +0200
committerMichael Stahl <mstahl@redhat.com>2014-07-29 15:49:56 +0000
commit438bcf52858d6d5355d5aff9e3721c9467920d7c (patch)
treed2bdce566ca02965b0e94cfb3bc748b1cd31a58e /svx
parent30ef30970073b969430011da25e9412ffc217e8b (diff)
rhbz#1121254 reload font list from shell on change
Change-Id: Ief88373c210b3b6f65c1df5b31870aca561095bb (cherry picked from commit 0497864bd4f603605997938d504ef9598623e713) Reviewed-on: https://gerrit.libreoffice.org/10546 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d5cdd4f93c88..69c33e4eca44 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -944,6 +944,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 );
}