current/SOURCES/0001-rhbz-1121254-reload-font-list-from-shell-on-change.patch

From 0497864bd4f603605997938d504ef9598623e713 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Fri, 25 Jul 2014 15:40:27 +0200
Subject: [PATCH] rhbz#1121254 reload font list from shell on change

Change-Id: Ief88373c210b3b6f65c1df5b31870aca561095bb
---
 svx/source/tbxctrls/tbcontrl.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 816afbe..5728791 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -891,6 +891,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 );
 }
-- 
1.9.3

1	From 0497864bd4f603605997938d504ef9598623e713 Mon Sep 17 00:00:00 2001
2	From: David Tardon <dtardon@redhat.com>
3	Date: Fri, 25 Jul 2014 15:40:27 +0200
4	Subject: [PATCH] rhbz#1121254 reload font list from shell on change
5
6	Change-Id: Ief88373c210b3b6f65c1df5b31870aca561095bb
7	---
8	svx/source/tbxctrls/tbcontrl.cxx \| 6 ++++++
9	1 file changed, 6 insertions(+)
10
11	diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
12	index 816afbe..5728791 100644
13	--- a/svx/source/tbxctrls/tbcontrl.cxx
14	+++ b/svx/source/tbxctrls/tbcontrl.cxx
15	@@ -891,6 +891,12 @@ void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
16	Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT);
17	SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT));
18	}
19	+ else if ( rDCEvt.GetType() == DATACHANGED_FONTS )
20	+ {
21	+ // The old font list in shell has likely been destroyed at this point, so we need to get
22	+ // the new one before doing anything further.
23	+ lcl_GetDocFontList( &pFontList, this );
24	+ }
25
26	FontNameBox::DataChanged( rDCEvt );
27	}
28	--
29	1.9.3
30