[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/source

Herbert Dürr hdu at apache.org
Wed Aug 7 03:07:48 PDT 2013


 fpicker/source/aqua/CFStringUtilities.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6f279aad1a472ebf4afd08334e10a24342924315
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed Aug 7 10:00:20 2013 +0000

    #i122301# fix build breaker on Mac in fpicker for debug=true
    
    NSLog demands a non-const NSString but doesn't change the string.

diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index c891247..4df5b29 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -72,7 +72,7 @@ inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, con
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const NSString* value1) {
     OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
 #if OSL_DEBUG_LEVEL > 1
-    NSLog(value1);
+    NSLog( const_cast<NSString*>(value1));
 #endif
 }
 
@@ -106,7 +106,7 @@ inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, con
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int value1, const char* param2, const NSString* value2) {
     OSL_TRACE(">>> %s::%s%s%s = %d%s%s =", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
 #if OSL_DEBUG_LEVEL > 1
-    NSLog(value2);
+    NSLog( const_cast<NSString*>(value2));
 #endif
 }
 
@@ -146,7 +146,7 @@ inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, cons
 inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* retVal) {
     OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
 #if OSL_DEBUG_LEVEL > 1
-    NSLog(retVal);
+    NSLog( const_cast<NSString*>(retVal));
 #endif
 }
 


More information about the Libreoffice-commits mailing list