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

Herbert Dürr hdu at apache.org
Thu Aug 8 00:46:48 PDT 2013


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

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

    Resolves: #i122301# fix build breaker on Mac in fpicker for debug=true
    
    NSLog demands a non-const NSString but doesn't change the string.
    
    (cherry picked from commit 6f279aad1a472ebf4afd08334e10a24342924315)
    
    Conflicts:
    	fpicker/source/aqua/CFStringUtilities.hxx
    
    Change-Id: I25c82dc81feda9b771f064631857a1e7f9c4d2bb

diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 655312e..1b5ef0d 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -76,7 +76,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)
 {
     SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " =");
-    NSLog(value1);
+    NSLog(const_cast<NSString*>(value1));
 }
 #else
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const NSString* /* value1 */)
@@ -117,7 +117,7 @@ inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, con
 {
     SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1 << PARAMFILLER << param2 << " =" << value2);
 #if OSL_DEBUG_LEVEL > 1
-    NSLog(value2);
+    NSLog( const_cast<NSString*>(value2));
 #endif
 }
 
@@ -165,7 +165,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)
 {
     SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = ");
-    NSLog(retVal);
+    NSLog(const_cast<NSString*>(retVal));
 }
 #else
 inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* /* retVal */ )


More information about the Libreoffice-commits mailing list