[Libreoffice-commits] .: Branch 'feature/android' - vcl/android

Tor Lillqvist tml at kemper.freedesktop.org
Thu Jan 26 08:03:16 PST 2012


 vcl/android/androidinst.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 612fc199c3884b48770740acf8b441f3506b47e1
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Jan 26 17:45:00 2012 +0200

    Include the separate tag argument in the __android_log_print() calls
    
    It's the *third* argument that is the printf-style format string.

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index d8ba0b0..8235603 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -363,7 +363,7 @@ void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
         aError = rtl::OUString::createFromAscii("Unknown application error");
     ::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
 
-    __android_log_print(ANDROID_LOG_INFO, "SalAbort: '%s'",
+    __android_log_print(ANDROID_LOG_INFO, "LibreOffice", "SalAbort: '%s'",
                         rtl::OUStringToOString(aError, RTL_TEXTENCODING_ASCII_US).getStr());
     if( bDumpCore )
         abort();
@@ -414,7 +414,7 @@ int AndroidSalSystem::ShowNativeDialog( const rtl::OUString& rTitle,
     fprintf (stderr, "LibreOffice native dialog '%s': '%s'\n",
              rtl::OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
              rtl::OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
-    __android_log_print(ANDROID_LOG_INFO, "LibreOffice - dialog '%s': '%s'",
+    __android_log_print(ANDROID_LOG_INFO, "LibreOffice", "Dialog '%s': '%s'",
                         rtl::OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
                         rtl::OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
 


More information about the Libreoffice-commits mailing list