summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx11
1 files changed, 10 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 88a6b93f6139..ea648c8b6e98 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1040,8 +1040,17 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
// or select
if ( rUDEvt.GetItemId() == rUDEvt.GetStyle() )
{
+ OUString fontName(GetText());
+ if (IsInDropDown())
+ {
+ /*
+ * when in dropdown mode the selected item should be
+ * used and not the current selection
+ */
+ fontName = GetEntry(rUDEvt.GetItemId());
+ }
Sequence< PropertyValue > aArgs( 1 );
- vcl::FontInfo aInfo( pFontList->Get( GetEntry( rUDEvt.GetItemId() ),
+ vcl::FontInfo aInfo( pFontList->Get( fontName,
aCurFont.GetWeight(),
aCurFont.GetItalic() ) );