[Libreoffice-commits] core.git: cui/source include/svx svx/source

[Akshay Deep]

 cui/source/dialogs/cuicharmap.cxx |    3 +--
 include/svx/ucsubset.hxx          |    1 -
 svx/source/dialog/charmap.cxx     |    1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 01bca61907433705950cdd78734851ac41def493
Author: Akshay Deep <akshaydeepiitr at gmail.com>
Date:   Tue Aug 15 16:28:41 2017 +0530

    Disable subset LB when search mode is enabled
    
    Change-Id: Ic8fa88f1e471fe3eab965e5f0106de0348e62ec0
    Reviewed-on: https://gerrit.libreoffice.org/41161
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Akshay Deep <akshaydeepiitr at gmail.com>

diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 0831604b408b..fa7a192ccef1 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -694,8 +694,7 @@ void SvxCharacterMap::toggleSearchView(bool state)
     isSearchMode = state;
     m_pHexCodeText->SetReadOnly(state);
     m_pDecimalCodeText->SetReadOnly(state);
-    m_pSubsetLB->SetReadOnly(state);
-    m_pSubsetLB->Invalidate();
+    m_pSubsetLB->Disable(state);
 
     if(state)
     {
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index f5dc7847ab98..570913f3bd18 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -22,7 +22,6 @@
 
 #include <svx/svxdllapi.h>
 
-#include <unordered_map>
 #include <vcl/metric.hxx>
 
 #include <list>
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 110b488c4483..9a1b22ad34e9 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -25,7 +25,6 @@
 
 #include <rtl/textenc.h>
 #include <svx/ucsubset.hxx>
-#include <unordered_map>
 
 
 #include <svx/strings.hrc>