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

[Caolán McNamara]

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

New commits:
commit b8bfa9051242393cc940382fd2a2f34af4db11af
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/55345
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 8b568d80269a..1d8d286d03cc 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -680,7 +680,8 @@ void SvxShowCharSet::RecalculateFont(vcl::RenderContext& rRenderContext)
 
     // restore last selected unicode
     int nMapIndex = mxFontCharMap->GetIndexFromChar(getSelectedChar());
-    SelectIndex(nMapIndex);
+    if (nMapIndex != nSelectedIndex)
+        SelectIndex(nMapIndex);
 
     // rearrange CharSet element in sync with nX- and nY-multiples
     Size aDrawSize(nX * COLUMN_COUNT, nY * ROW_COUNT);