sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9006cbf6a13317a386194d6857f22391464c2aa0
Author:     Shivam Kumar Singh <shivamhere...@gmail.com>
AuthorDate: Tue Jun 30 19:47:56 2020 +0530
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Jul 16 02:41:16 2020 +0200

    Support for disabling Asian/Complex fonts for Inspector
    
    Hide/Show Asian and Complex properties from the Inspector
    when disabled/enabled from Tools->Options->Language Settings
    
    Change-Id: I6447d4406b9371d63e757b332c3393f3496e0a4f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97530
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx 
b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index 83c48c41815a..da9f7eaa4709 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 #include <unotextrange.hxx>
+#include <svl/languageoptions.hxx>
 
 namespace sw::sidebar
 {
@@ -62,7 +63,9 @@ static bool GetPropertyValues(const beans::Property 
rProperty, const uno::Any& r
                               OUString& rString)
 {
     // Hide Asian and Complex properties
-    if (rProperty.Name.indexOf("Asian") != -1 || 
rProperty.Name.indexOf("Complex") != -1)
+    if (SvtLanguageOptions().IsCJKFontEnabled() && 
rProperty.Name.indexOf("Asian") != -1)
+        return false;
+    if (SvtLanguageOptions().IsCTLFontEnabled() && 
rProperty.Name.indexOf("Complex") != -1)
         return false;
 
     OUString aValue;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to