diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-08-07 10:00:20 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-08 08:44:44 +0100 |
| commit | 7fd15394ad721fd2f954488c16e709d87d03ea2e (patch) | |
| tree | a0801a9a4f9d5044b4f1f1d0ac1feabba85657c0 /fpicker | |
| parent | a0bbc768a5fac2c3d27cd70877961561fe7f0ffa (diff) | |
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
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/CFStringUtilities.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx index 655312ef5ce6..1b5ef0d40e2b 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 */ ) |