From 78e4b913d1bdcef83f66249fb5006803f28f96d1 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Mon, 25 May 2015 19:57:26 +0900
Subject: tdf#91582 initialize charmap when selecting in SvxShowCharSet

Change-Id: I3f73eef349e65a1d2d283d1116729694c1f40ed9
---
 svx/source/dialog/charmap.cxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'svx')

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 104161dfd84d..c334d3f577fe 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -647,6 +647,9 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus )
 
 void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus )
 {
+    if (mpFontCharMap == nullptr)
+        RecalculateFont(*this);
+
     // get next available char of current font
     sal_UCS4 cNext = mpFontCharMap->GetNextChar( (cNew > 0) ? cNew - 1 : cNew );
 
-- 
cgit