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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Fri Apr 12 10:37:59 UTC 2019


 svgio/source/svguno/xsvgparser.cxx |    2 +-
 vcl/source/app/scheduler.cxx       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b27035fb8e8b0b8e9ce0ad31fdcd55cef7ab59e7
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Apr 12 13:36:43 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Apr 12 13:36:43 2019 +0300

    At least tell by how many ticks we are too early
    
    Change-Id: I71a822495c8a41cf01efe611911afcafea81118d

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index b53a58ecf555..55c6a1d8bb74 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -347,7 +347,7 @@ bool Scheduler::ProcessTaskScheduling()
     sal_uInt64 nTime = tools::Time::GetSystemTicks();
     if ( nTime < rSchedCtx.mnTimerStart + rSchedCtx.mnTimerPeriod )
     {
-        SAL_WARN( "vcl.schedule", "we're too early - restart the timer!" );
+        SAL_WARN( "vcl.schedule", "we're too early by " << (rSchedCtx.mnTimerStart + rSchedCtx.mnTimerPeriod - nTime) << " ticks, restart the timer" );
         UpdateSystemTimer( rSchedCtx,
                            rSchedCtx.mnTimerStart + rSchedCtx.mnTimerPeriod - nTime,
                            true, nTime );
commit 1408fded0a90e92eff6b0b09316589a80ad90c87
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Apr 12 13:30:47 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Apr 12 13:30:47 2019 +0300

    Downgrade a SAL_WARN() that shows up a lot but can be ignored to SAL_INFO()
    
    Quikee said it was OK.
    
    Change-Id: I8f45d3c5e264f5658985399487e9c6e2a3fbced3

diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx
index 015ac547945d..f1f2e47451ae 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -136,7 +136,7 @@ namespace svgio
             }
             catch(const uno::Exception& e)
             {
-                SAL_WARN( "svg", "Parse error! : " << e);
+                SAL_INFO( "svg", "Parse error: " << e);
                 return false;
             }
 


More information about the Libreoffice-commits mailing list