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

[Tomaž Vajngerl (via logerrit)]

 desktop/source/lib/init.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05fc232be8082d0a3b42d354eb830da582c2c335
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Aug 8 17:45:49 2019 +0900
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Aug 12 11:46:39 2019 +0200

    lok: Output a SAL_WARN only if message is not empty
    
    Because we call SetLastExceptionMsg with an empty message when we
    want to reset the exception message and this happens all the time
    in the LOK code.
    
    Change-Id: Iead1b561d303d610db5e02f79a7af6c72b43834a
    Reviewed-on: https://gerrit.libreoffice.org/77144
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 502f0690c362518681723e029d810762f652c675)
    Reviewed-on: https://gerrit.libreoffice.org/77339
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bce7c5594dca..a999d8d308ae 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -167,7 +167,7 @@ static std::weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass;
 
 static void SetLastExceptionMsg(const OUString& s = OUString())
 {
-    SAL_WARN("lok", "lok exception " + s);
+    SAL_WARN_IF(!s.isEmpty(), "lok", "lok exception '" + s + "'");
     if (gImpl)
         gImpl->maLastExceptionMsg = s;
 }