[Libreoffice-commits] .: 2 commits - fpicker/Library_fps_aqua.mk fpicker/source

[Norbert Thiebaud]

 fpicker/Library_fps_aqua.mk                   |    5 ++
 fpicker/source/aqua/AquaFilePickerDelegate.mm |    4 +
 fpicker/source/aqua/CFStringUtilities.hxx     |   58 +++++++++++++++++---------
 3 files changed, 48 insertions(+), 19 deletions(-)

New commits:
commit 7e2f0a0f92e592cb7374ec41d516eca32a8e5c33
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Dec 27 07:37:16 2011 -0600

    add the needed -framework for fps_aqua

diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index ca39922..a2575d0 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -34,6 +34,11 @@ $(eval $(call gb_Library_add_api,fps_aqua,\
 	udkapi \
 ))
 
+$(eval $(call gb_Library_add_libs,fps_aqua,\
+    -framework Cocoa \
+    -framework CoreFoundation \
+))
+
 $(eval $(call gb_Library_add_linked_libs,fps_aqua,\
 	cppu \
 	cppuhelper \
commit daadc82a1d511998228e198802f0a06420f6bcee
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Dec 27 07:36:52 2011 -0600

    WaE unused variables

diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm
index 2fef707..8482f69 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.mm
@@ -59,6 +59,7 @@
 
 - (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename
 {
+    (void)sender;
     if( filterHelper == NULL )
         return true;
     if( filename == nil )
@@ -68,6 +69,7 @@
 
 - (void)panelSelectionDidChange:(id)sender
 {
+    (void)sender;
     if (filePicker != NULL) {
         ::com::sun::star::ui::dialogs::FilePickerEvent evt;
         filePicker->fileSelectionChanged(evt);
@@ -76,6 +78,8 @@
 
 - (void)panel:(id)sender directoryDidChange:(NSString *)path
 {
+    (void)sender;
+    (void)path;
     if (filePicker != NULL) {
         ::com::sun::star::ui::dialogs::FilePickerEvent evt;
         filePicker->directoryChanged(evt);
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 6974899..7dc53a4 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -67,23 +67,32 @@ inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, con
     OSL_TRACE(">>> %s::%s%s%s = %s", classname, methodname, PARAMFILLER, param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr());
 }
 
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const CFStringRef value1) {
-    OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
 #if OSL_DEBUG_LEVEL > 1
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const CFStringRef value1)
+{
+    OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
     CFShow(value1);
+
+}
 #else
-    (void)value1;
-#endif
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const CFStringRef /* value1 */)
+{
+    OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
 }
+#endif
 
-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
+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);
     NSLog(value1);
+}
 #else
-    (void)value1;
-#endif
+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);
 }
+#endif
 
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int value1) {
     OSL_TRACE(">>> %s::%s%s%s = %d", classname, methodname, PARAMFILLER, param1, value1);
@@ -105,20 +114,23 @@ inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, con
     OSL_TRACE(">>> %s::%s%s%s = %d%s%s = %s", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
 }
 
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int value1, const char* param2, const CFStringRef value2) {
+inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int value1, const char* param2, const CFStringRef value2)
+{
     OSL_TRACE(">>> %s::%s%s%s = %d%s%s =", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
 #if OSL_DEBUG_LEVEL > 1
     CFShow(value2);
 #endif
 }
 
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int value1, const char* param2, const NSString* value2) {
+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);
-#endif
+#endif}
 }
 
+
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const rtl::OUString& value1, const char* param2, const rtl::OUString& value2) {
     OSL_TRACE(">>> %s::%s%s%s = %s%s%s = %s", classname, methodname, PARAMFILLER, param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr(), PARAMFILLER, param2, OUStringToOString(value2, RTL_TEXTENCODING_UTF8).getStr());
 }
@@ -145,23 +157,31 @@ inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, int
     OSL_TRACE("<<< %s::%s%sreturnValue = %d", classname, methodname, PARAMFILLER, retVal);
 }
 
-inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const CFStringRef retVal) {
-    OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
 #if OSL_DEBUG_LEVEL > 1
+inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const CFStringRef retVal)
+{
+    OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
     CFShow(retVal);
+}
 #else
-    (void)retVal;
-#endif
+inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const CFStringRef /* retVal */)
+{
+    OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
 }
+#endif
 
-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
+inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* retVal)
+{
+    OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
     NSLog(retVal);
+}
 #else
-    (void)retVal;
-#endif
+inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* /* retVal */ )
+{
+    OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
 }
+#endif
 
 inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const rtl::OUString& retVal) {
     OSL_TRACE("<<< %s::%s%sreturnValue = %s", classname, methodname, PARAMFILLER, OUStringToOString(retVal, RTL_TEXTENCODING_UTF8).getStr());