[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source

[Tomaž Vajngerl]

 svx/source/dialog/charmap.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5d08e3736e94bf916c12c2eb3e17602a693c4c97
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Mon May 25 19:57:26 2015 +0900

    tdf#91582 initialize charmap when selecting in SvxShowCharSet
    
    Change-Id: I3f73eef349e65a1d2d283d1116729694c1f40ed9

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 104161d..c334d3f 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 );