[Libreoffice-commits] core.git: sal/osl sal/util

[Thorsten Behrens]

 sal/osl/all/compat.cxx |   12 ++++++++++++
 sal/util/sal.map       |    3 +++
 2 files changed, 15 insertions(+)

New commits:
commit 5818dd94599540196072955b5987671f7f7d5a44
Author: Thorsten Behrens <thb at documentfoundation.org>
Date:   Mon Feb 16 17:22:14 2015 +0100

    Related: tdf#63690 - add stubs for removed rtl_logfile functions.
    
    This fixes up 3d403f2af2e5b7d26254d45590764f279450fab6, by not
    removing public API.
    
    Change-Id: I60a4b7284661238bdf32a1600f27a7e507c5374a

diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
index 592ac90..2f482de 100644
--- a/sal/osl/all/compat.cxx
+++ b/sal/osl/all/compat.cxx
@@ -150,6 +150,18 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_zeroMemory(void *, sal_Size) {
     std::abort();
 }
 
+SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_logfile_trace( const sal_Char* pszFormat, ... ) {
+    std::abort();
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_logfile_longTrace(char const * format, ...) {
+    std::abort();
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL rtl_logfile_hasLogFile( void ) {
+    for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/util/sal.map b/sal/util/sal.map
index bca9c88..6acd9c4 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -500,6 +500,7 @@ UDK_3_0_0 {
         rtl_addUnloadingListener;
         rtl_removeUnloadingListener;
 
+        rtl_logfile_trace;
         osl_getProcessLocale;
         osl_setProcessLocale;
     local:
@@ -545,6 +546,7 @@ UDK_3.3 {
         osl_setCommandArgs;
         rtl_uStringbuffer_insertUtf32;
         rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths;
+        rtl_logfile_longTrace;
         rtl_ustr_asciil_reverseEquals_WithLength;
 } UDK_3.2;
 
@@ -606,6 +608,7 @@ UDK_3.9 { # OOo 3.1
 
 UDK_3.10 { # OOo 3.2
     global:
+        rtl_logfile_hasLogFile;
         rtl_math_erf;
         rtl_math_erfc;
         rtl_math_asinh;