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

[Caolán McNamara]

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

New commits:
commit 63e1546668ac464d1ba0b02ba5e76fb064e63100
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 5 16:49:11 2018 +0100

    Resolves: tdf#116876 don't reselect index on resize if it wouldn't change
    
    selecting the index sets it as active and updates the previews, so if its an
    inactive index and resize happens, leave it as inactive but selected
    
    Change-Id: If823f6b3e8f2ee4e77ba5e5d0202d72893ed614c
    Reviewed-on: https://gerrit.libreoffice.org/55346
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 9fc4f3f66a8b..7a57199e2d87 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -758,7 +758,8 @@ void SvxShowCharSet::RecalculateFont(vcl::RenderContext& rRenderContext)
 
     // restore last selected unicode
     int nMapIndex = mxFontCharMap->GetIndexFromChar(getSelectedChar());
-    SelectIndex(nMapIndex);
+    if (nMapIndex != nSelectedIndex)
+        SelectIndex(nMapIndex);
 
     aVscrollSB->Show();