[Libreoffice-commits] core.git: svtools/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sun Apr 26 20:01:50 UTC 2020


 svtools/source/control/ctrlbox.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 60fcd4427231e8c48cd3bf8307e280fd3a13a84f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Apr 26 19:52:51 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Apr 26 22:00:54 2020 +0200

    tdf#132424 don't generate font previews in advance for lool
    
    Change-Id: I393db7b019fe16b2b7361bd20ec99dc5671ba1ef
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92943
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index d1c2fe0be831..f5ad5df85fe5 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -19,6 +19,7 @@
 
 #include <config_folders.h>
 
+#include <comphelper/lok.hxx>
 #include <i18nutil/unicode.hxx>
 #include <tools/stream.hxx>
 #include <vcl/builder.hxx>
@@ -465,7 +466,7 @@ void FontNameBox::Fill( const FontList* pList )
 
 void FontNameBox::EnableWYSIWYG()
 {
-    if (mbWYSIWYG)
+    if (mbWYSIWYG || comphelper::LibreOfficeKit::isActive())
         return;
     mbWYSIWYG = true;
 


More information about the Libreoffice-commits mailing list