mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i122301# fix build breaker on Mac in fpicker for debug=true

Browse Source 
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
This commit is contained in:
Herbert Dürr 2013-08-07 10:00:20 +00:00 committed by Caolán McNamara
parent a0bbc768a5
commit 7fd15394ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fpicker/source/aqua/CFStringUtilities.hxx
View File

@ -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) 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 << " ="); SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " =");
NSLog(value1); NSLog(const_cast<NSString*>(value1));
} }
#else #else
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const NSString* /* value1 */) 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); SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1 << PARAMFILLER << param2 << " =" << value2);
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
NSLog(value2); NSLog( const_cast<NSString*>(value2));
#endif #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) inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* retVal)
{ {
SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = "); SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = ");
NSLog(retVal); NSLog(const_cast<NSString*>(retVal));
} }
#else #else
inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* /* retVal */ ) inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* /* retVal */ )