Remove the obsolete functionality originally underlying osl/diagnose.h

...before that got rebased onto sal/log.hxx.  That functionality is considered
an implementation detail, so it should be safe to remove it from the URE
interface.  As usual, aborting stubs are retained for SONAME stability.

Change-Id: If948b9714c26a3871e38dea4d4d5b5466d6ee258

2 files changed, 37 insertions, 28 deletions

diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
index efe787796f66..ef44215b00ed 100644
--- a/sal/osl/all/compat.cxx
+++ b/sal/osl/all/compat.cxx
@@ -23,6 +23,16 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_acquireSemaphore(void *) {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_assertFailedLine(
+    char const *, sal_Int32, char const *)
+{
+    for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL osl_breakDebug() {
+    std::abort();
+}
+
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL osl_createSemaphore(sal_uInt32) {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
@@ -39,6 +49,33 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_releaseSemaphore(void *) {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
+SAL_DLLPUBLIC_EXPORT sal_Int32 SAL_CALL osl_reportError(
+    sal_uInt32, char const *)
+{
+    for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+namespace {
+typedef void (SAL_CALL * pfunc_osl_printDebugMessage)(char const *);
+}
+SAL_DLLPUBLIC_EXPORT pfunc_osl_printDebugMessage SAL_CALL
+osl_setDebugMessageFunc(pfunc_osl_printDebugMessage) {
+    for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+namespace {
+typedef void (SAL_CALL * pfunc_osl_printDetailedDebugMessage)(
+    char const *, sal_Int32, char const *);
+}
+SAL_DLLPUBLIC_EXPORT pfunc_osl_printDetailedDebugMessage SAL_CALL
+osl_setDetailedDebugMessageFunc(pfunc_osl_printDetailedDebugMessage) {
+    for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL osl_trace(char const *, ...) {
+    std::abort();
+}
+
 SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_tryToAcquireSemaphore(void *) {
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
diff --git a/sal/osl/all/trace.cxx b/sal/osl/all/trace.cxx
deleted file mode 100644
index 007f36406350..000000000000
--- a/sal/osl/all/trace.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "sal/config.h"
-
-#include <cstdarg>
-
-#include "osl/diagnose.h"
-#include "sal/detail/log.h"
-#include "sal/log.hxx"
-
-#include "logformat.hxx"
-
-void osl_trace(char const * pszFormat, ...) {
-    std::va_list args;
-    va_start(args, pszFormat);
-    osl::detail::logFormat(
-        SAL_DETAIL_LOG_LEVEL_INFO, "legacy.osl", SAL_WHERE, pszFormat, args);
-    va_end(args);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */