1 files changed, 8 insertions, 86 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
index 6a8ef3232bc4..eb1cd03c8a8d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
+++ b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
@@ -25,98 +25,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#if !defined INCLUDED_JFW_PLUGIN_DIAGNOSTICS_HXX
-#define INCLUDED_JFW_PLUGIN_DIAGNOSTICS_HXX
-#include "osl/diagnose.h"
-#include "rtl/ustring.hxx"
-#include <stdio.h>
-
-#if OSL_DEBUG_LEVEL >= 1
-#define JFW_ENSURE(c, m)  _JFW_ENSURE(c, OSL_THIS_FILE, __LINE__,  m)
-#else
-#define JFW_ENSURE(c, m)  ((void) 0)
-#endif
-
-#if OSL_DEBUG_LEVEL >= 2
-#define JFW_WARNING2(c, m)  _JFW_WARNING2(c, OSL_THIS_FILE, __LINE__, m)
-#else
-#define JFW_WARNING2(c, m)  ((void) 0)
-#endif
-
-
-#if OSL_DEBUG_LEVEL >= 0
-#define JFW_TRACE0(m)  jfw_trace(m)
-#else
-#define JFW_TRACE0(m)  ((void) 0)
-#endif
-
-#if OSL_DEBUG_LEVEL >= 1
-#define JFW_TRACE1(m)  jfw_trace(m)
-#else
-#define JFW_TRACE1(m)  ((void) 0)
-#endif
-
-#if OSL_DEBUG_LEVEL >= 2
-#define JFW_TRACE2(m)  jfw_trace(m)
-#else
-#define JFW_TRACE2(m)  ((void) 0)
-#endif
-
-
 
-#define _JFW_ENSURE(c, f, l, m)  jfw_ensure(c, f, l, m)
-#define _JFW_WARNING(c, f, l, m)  jfw_warning2(c, f, l, m);
-
-
-namespace jfw_plugin
-{
-
-inline void jfw_ensure(bool
-                       #if OSL_DEBUG_LEVEL > 0 /* prevent warning in pro version */
-                       condition
-                       #endif
-                       , const sal_Char *
-                       #if OSL_DEBUG_LEVEL > 0 /* prevent warning in pro version */
-                       pzFile
-                       #endif
-                       , sal_Int32
-                       #if OSL_DEBUG_LEVEL > 0 /* prevent warning in pro version */
-                       line
-                       #endif
-                       , const rtl::OUString& message )
-{
-    rtl::OString oMsg = rtl::OUStringToOString(message, osl_getThreadTextEncoding());
-    _OSL_ENSURE(condition, pzFile, line, oMsg.getStr());
-}
+#ifndef INCLUDED_JFW_PLUGIN_DIAGNOSTICS_HXX
+#define INCLUDED_JFW_PLUGIN_DIAGNOSTICS_HXX
 
-inline void jfw_warning2(bool condition, const sal_Char * pzFile, sal_Int32 line,
-                         sal_Char * pzMessage)
-{
-    if (! condition)
-        fprintf(
-            stderr, "%s\n File: %s\n Line: %ld", pzMessage, pzFile,
-            sal::static_int_cast< unsigned long >(line));
-}
+#include "sal/config.h"
 
-inline void jfw_trace(rtl::OUString message)
-{
-    rtl::OString oMsg = rtl::OUStringToOString(message, osl_getThreadTextEncoding());
-    fprintf(stderr,"%s", oMsg.getStr());
-}
+#include "rtl/oustringostreaminserter.hxx"
+#include "sal/log.h"
 
-inline void jfw_trace(const sal_Char * pzMessage)
-{
-    if (pzMessage)
-        fprintf(stderr,"%s", pzMessage);
-}
+#define JFW_ENSURE(c, m) SAL_WARN_IF_S(!(c), "jfw", m)
 
-inline void jfw_trace(const rtl::OString& message)
-{
-    if (message.getLength() > 0)
-        fprintf(stderr,"%s", message.getStr());
-}
+#define JFW_TRACE0(m) SAL_INFO_S("jfw.level1", m)
 
-}
+#define JFW_TRACE2(m) SAL_INFO_S("jfw.level2", m);
 
 #endif