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

[Tor Lillqvist (via logerrit)]

 sw/source/ui/vba/vbadocument.cxx  |    2 ++
 sw/source/ui/vba/vbadocuments.cxx |    2 ++
 vcl/source/app/scheduler.cxx      |    1 -
 vcl/source/outdev/map.cxx         |    4 ----
 4 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 6412701313a875aff199dbf862e250faf6861cd0
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Sep 18 16:43:40 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Sep 18 16:43:40 2019 +0300

    Add a SAL_INFO for SwVbaDocument::SaveAs2000()
    
    Change-Id: Ic91b9c3a832d68ca3ccc61ccb19b0e29b488abc0

diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index d9aec575b6c4..a0c7401b4b00 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -459,6 +459,8 @@ SwVbaDocument::Frames( const uno::Any& index )
 void SAL_CALL
 SwVbaDocument::SaveAs2000( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*LockComments*/, const uno::Any& /*Password*/, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*WritePassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*EmbedTrueTypeFonts*/, const uno::Any& /*SaveNativePictureFormat*/, const uno::Any& /*SaveFormsData*/, const uno::Any& /*SaveAsAOCELetter*/ )
 {
+    SAL_INFO("sw.vba", "Document.SaveAs2000(FileName:=" << FileName << ",FileFormat:=" << FileFormat << ")");
+
     // Based on ScVbaWorkbook::SaveAs.
     OUString sFileName;
     FileName >>= sFileName;
commit 0993ccb56eba6e52d5b3b00f60ea069571f2554a
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Sep 18 15:43:51 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Sep 18 15:43:51 2019 +0300

    Add a SAL_INFO for SwVbaDocuments::Open()
    
    Change-Id: I0c62864f3efa53dde0dc78482d8e9c7ffc35b6ee

diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index b32b80beeac5..083ffcadf6fb 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -120,6 +120,8 @@ SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*Origin
 uno::Any SAL_CALL
 SwVbaDocuments::Open( const OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ )
 {
+    SAL_INFO("sw.vba", "Documents.Open(Filename:=" << Filename << ",ReadOnly:=" << ReadOnly << ")");
+
     // we need to detect if this is a URL, if not then assume it's a file path
     OUString aURL;
     INetURLObject aObj;
commit 9f2ded72a11190384c4a2d17b79e8db754110924
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Sep 18 13:01:30 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Sep 18 13:01:30 2019 +0300

    Get rid of another SAL_WARN that just pointlessly fills up log files
    
    Change-Id: Ic499677dad477d1ed194d63929f9374995fccb65

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 55c6a1d8bb74..7a73aa0d1de1 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -347,7 +347,6 @@ bool Scheduler::ProcessTaskScheduling()
     sal_uInt64 nTime = tools::Time::GetSystemTicks();
     if ( nTime < rSchedCtx.mnTimerStart + rSchedCtx.mnTimerPeriod )
     {
-        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 7dd803da92d9b2ff36ded57ea22fbb41ef1db28f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Sep 18 12:55:11 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Sep 18 12:55:11 2019 +0300

    Drop some useless warnings that we get hundreds of
    
    Change-Id: Ie83b4ad7a7ab1c26ff081f70ad98eb39a04f1015

diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index dbb79e80b835..6711ae94ad7c 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1484,10 +1484,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 )                                \