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

[Tor Lillqvist (via logerrit)]

 vcl/source/app/scheduler.cxx |    1 -
 vcl/source/outdev/map.cxx    |    4 ----
 2 files changed, 5 deletions(-)

New commits:
commit 5a742afd3dde74138bda8fd140d3801b3ca900e6
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Sep 18 13:01:30 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 15:51:58 2019 +0200

    Get rid of another SAL_WARN that just pointlessly fills up log files
    
    Change-Id: Ic499677dad477d1ed194d63929f9374995fccb65
    Reviewed-on: https://gerrit.libreoffice.org/79254
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 80d4b1b9e4ce..e16d27b25cb5 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -367,7 +367,6 @@ bool Scheduler::ProcessTaskScheduling()
     if ( nTime < rSchedCtx.mnTimerStart + rSchedCtx.mnTimerPeriod -1)
     {
         int nSleep = rSchedCtx.mnTimerStart + rSchedCtx.mnTimerPeriod - nTime;
-        SAL_WARN("vcl.schedule", "we're too early - restart the timer (" << nSleep << "ms)!");
         UpdateSystemTimer(rSchedCtx, nSleep, true, nTime);
         return false;
     }
commit dedf3da4d33a51f63006b125991e1d64d70df381
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Sep 18 12:55:11 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 15:51:37 2019 +0200

    Drop some useless warnings that we get hundreds of
    
    Change-Id: Ie83b4ad7a7ab1c26ff081f70ad98eb39a04f1015
    (cherry picked from commit 7dd803da92d9b2ff36ded57ea22fbb41ef1db28f)
    Reviewed-on: https://gerrit.libreoffice.org/79253
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 9447bf80532c..57969ec5758c 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1488,10 +1488,6 @@ static void verifyUnitSourceDest( MapUnit eUnitSource, MapUnit eUnitDest )
                 && eUnitDest != MapUnit::MapAppFont
                 && eUnitDest != MapUnit::MapRelative,
                 "Destination MapUnit is not permitted" );
-    SAL_WARN_IF( eUnitSource == MapUnit::MapPixel, "vcl.gdi",
-                       "MapUnit::MapPixel approximated with 72dpi" );
-    SAL_WARN_IF( eUnitDest == MapUnit::MapPixel, "vcl.gdi",
-                       "MapUnit::MapPixel approximated with 72dpi" );
 }
 
 #define ENTER3( eUnitSource, eUnitDest )                                \