[Libreoffice-commits] core.git: 2 commits - fpicker/source include/sal

[Stephan Bergmann]

 fpicker/source/aqua/SalAquaFilePicker.mm   |    2 +-
 fpicker/source/aqua/SalAquaFolderPicker.mm |    2 +-
 fpicker/source/aqua/SalAquaPicker.mm       |    2 +-
 include/sal/detail/log.h                   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7196df7ac616be39689f21d8784fd78030868586
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 13 18:23:25 2015 +0100

    tdf#43157: Enable format check in sal_detail_logFormat
    
    Change-Id: I65296dd9b4b13fc1c3a3d8eed738e257b204b691

diff --git a/include/sal/detail/log.h b/include/sal/detail/log.h
index bd44cda..8dee501 100644
--- a/include/sal/detail/log.h
+++ b/include/sal/detail/log.h
@@ -60,7 +60,7 @@ SAL_DLLPUBLIC void SAL_CALL sal_detail_logFormat(
     enum sal_detail_LogLevel level, char const * area, char const * where,
     char const * format, ...)
 /* TODO: enabling this will produce a huge amount of -Werror=format errors: */
-#if defined __GNUC__ && 0
+#if defined __GNUC__
     __attribute__((format(printf, 4, 5)))
 #endif
     ;
commit 36aafefc064cf5d5df51b7ca7bcc7e2256cefd69
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Mar 14 09:23:43 2015 +0100

    tdf#43157: Fix format string violations in OSL_TRACE etc. (Mac OS X)
    
    Change-Id: Iab8c97560a9c46638d3943c2e129ddcf2e9db603

diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 11e5ee6..1e0a658 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -333,7 +333,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::
     }
 
     long nFiles = [files count];
-    OSL_TRACE("# of items: %d", nFiles);
+    SAL_INFO("fpicker.aqua", "# of items: " << nFiles);
 
     uno::Sequence< rtl::OUString > aSelectedFiles(nFiles > 1 ? nFiles + 1 : nFiles);
 
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 76cdb53..a597913 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -178,7 +178,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeEx
     }
 
     long nFiles = [files count];
-    OSL_TRACE("# of items: %d", nFiles);
+    SAL_INFO("fpicker.aqua", "# of items: " << nFiles);
 
     if (nFiles < 1) {
         throw uno::RuntimeException("no directory selected", static_cast< cppu::OWeakObject * >( this ));
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index 6fd4023..e45a37e 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -169,7 +169,7 @@ int SalAquaPicker::run()
         NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory];
         startDirectory = [NSURL URLWithString:temp];
 
-        OSL_TRACE("start dir: %s", [startDirectory path]);
+        SAL_INFO("fpicker.aqua", "start dir: " << [startDirectory path]);
     }
     else {
         startDirectory = [NSURL fileURLWithPath:NSHomeDirectory() isDirectory:YES];