[Libreoffice-commits] core.git: Branch 'refs/tags/cp-5.3-65' - translations vcl/source

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 20 12:25:21 UTC 2019


Rebased ref, commits from common ancestor:
commit b6a7161c40a2fc8719e54f7e639667943110f3ee
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Jun 20 14:22:56 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 20 14:22:56 2019 +0200

    build fix: no comphelper/profilezone.hxx in this branch
    
    Change-Id: I617e49262047ba981e20034ddfdc31209932a891

diff --git a/translations b/translations
index ddf3b88380fc..5c8037b1eea4 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ddf3b88380fc439d17256f3f0cb25cbcaa27bef0
+Subproject commit 5c8037b1eea42c23f7b20d203ace7c0317c55d7e
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index fa72408c2608..e289f68a1a57 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -32,7 +32,6 @@
 #include <salframe.hxx>
 #include <svdata.hxx>
 #include <comphelper/lok.hxx>
-#include <comphelper/profilezone.hxx>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLHelper.hxx>
 #endif
@@ -641,8 +640,6 @@ void Window::ImplCallOverlapPaint()
 
 IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Idle *, void)
 {
-    comphelper::ProfileZone aZone("VCL idle re-paint");
-
     // save paint events until layout is done
     if (IsSystemWindow() && static_cast<const SystemWindow*>(this)->hasPendingLayout())
     {
@@ -664,8 +661,6 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Idle *, void)
 
 IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Idle *, void)
 {
-    comphelper::ProfileZone aZone("VCL idle resize");
-
     if( mpWindowImpl->mbReallyVisible )
     {
         ImplCallResize();


More information about the Libreoffice-commits mailing list