core.git: include/sal jvmfwk/plugins

[Manish Bera (via logerrit)]

 include/sal/log-areas.dox                        |    1 +
 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |   11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 663f46379e06df0ee30d2648739ada2926cc2fef
Author:     Manish Bera <mbera.de...@gmail.com>
AuthorDate: Wed Jan 1 10:25:31 2025 +0530
Commit:     Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Sun Feb 2 17:23:47 2025 +0100

    tdf#130924 use SAL_INFO/WARN instead of f/printf
    
    Change-Id: I43ce33f470153e9f8c69851d44d3ba05faaad8ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179487
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d0b89aff5eef..425edb201d41 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -316,6 +316,7 @@ certain functionality.
 @li @c jfw
 @li @c jfw.level1
 @li @c jfw.level2
+@li @c jvmfwk.javaenvsetup
 
 @section LanguageTool
 
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 
b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 9a39f2131940..fbf6f02c7509 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -27,6 +27,7 @@
 #include <sal/main.h>
 #include <sal/types.h>
 #include <osl/thread.h>
+#include <sal/log.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/byteseq.hxx>
 #include <jvmfwk/framework.hxx>
@@ -65,7 +66,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         }
         else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
         {
-            fprintf(stderr,"javaldx failed!
");
+            SAL_WARN("jvmfwk.javaenvsetup", "javaldx failed!");
             return -1;
         }
 
@@ -74,7 +75,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
         if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS)
         {
-            fprintf(stderr,"javaldx failed!
");
+            SAL_WARN("jvmfwk.javaenvsetup", "javaldx failed!");
             return -1;
         }
 
@@ -95,7 +96,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
             }
             else
             {
-                fprintf(stderr, "javaldx: Could not determine if JRE still 
exist
");
+                SAL_WARN("jvmfwk.javaenvsetup", "javaldx: Could not determine 
if JRE still exist");
                 return -1;
             }
         }
@@ -145,12 +146,12 @@ static bool findAndSelect(std::unique_ptr<JavaInfo> * 
ppInfo)
     javaFrameworkError errcode = jfw_findAndSelectJRE(ppInfo);
     if (errcode == JFW_E_NO_JAVA_FOUND)
     {
-        fprintf(stderr,"javaldx: Could not find a Java Runtime Environment!
");
+        SAL_WARN("jvmfwk.javaenvsetup", "javaldx: Could not find a Java 
Runtime Environment!");
         return false;
     }
     else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
     {
-        fprintf(stderr,"javaldx failed!
");
+        SAL_WARN("jvmfwk.javaenvsetup", "javaldx failed!");
         return false;
     }
     return true;