[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source

[Jan Holesovsky]

 sw/source/uibase/misc/swruler.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ef180a1c08a82e3e27828194ffa8c6a7da156e2d
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Jun 28 16:12:30 2018 +0200

    lok: Don't even try to paint the ruler via LibreOfficeKit.
    
    But we need to have it behind the scenes, otherwise the Online's ruler
    does not get notifications.
    
    Change-Id: I72bef28cb15c462572b511449d538b067f7cb141
    Reviewed-on: https://gerrit.libreoffice.org/56598
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit ee6e6bd5b853aa68c9721f53b5892384e7403eec)
    Reviewed-on: https://gerrit.libreoffice.org/56600

diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 21f2470bc2f7..b663ade391f0 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -96,6 +96,9 @@ void SwCommentRuler::dispose()
 
 void SwCommentRuler::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return; // no need to waste time on startup
+
     SvxRuler::Paint(rRenderContext, rRect);
 
     // Don't draw if there is not any note