fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

- replaced OSL_TRACE with SAL_INFO

Change-Id: I4d63df493e85bc095b8a11e3842b0d69c5217c96
Reviewed-on: https://gerrit.libreoffice.org/1804Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>

fpicker/source/aqua/CFStringUtilities.hxx

@@ -26,7 +26,7 @@
 #include <postmac.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <osl/diagnose.h>
+#include "sal/log.hxx"
 
 enum InfoType {
     FULLPATH,
@@ -43,71 +43,71 @@ CFStringRef CFStringCreateWithOUString(const OUString& aString);
 #define PARAMFILLER "\n                    "
 
 inline void DBG_PRINT_ENTRY() {
-    OSL_TRACE(">>> %s", __func__);
+    SAL_INFO("fpicker.aqua",">>> "<< __func__);
 }
 
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname) {
-    OSL_TRACE(">>> %s::%s", classname, methodname);
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname);
 }
 
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const char* value1) {
-    OSL_TRACE(">>> %s::%s%s%s = %s", classname, methodname, PARAMFILLER, param1, value1);
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1);
 }
 
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const OUString& value1) {
-    OSL_TRACE(">>> %s::%s%s%s = %s", classname, methodname, PARAMFILLER, param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr());
 }
 
 #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);
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname<< PARAMFILLER << param1 <<" =");
     CFShow(value1);
 
 }
 #else
 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);
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " =");
 }
 #endif
 
 #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);
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " =");
     NSLog(value1);
 }
 #else
 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);
+    SAL_INFO("fpicker.aqua",">>> " << 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);
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1);
 }
 
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const char* value1, const char* param2, const int value2) {
-    OSL_TRACE(">>> %s::%s%s%s = %s%s%s = %d", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 <<" = " << value1 << PARAMFILLER << param2 << " = " << value2);
 }
 
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const char* value1, const char* param2, const char* value2) {
-    OSL_TRACE(">>> %s::%s%s%s = %s%s%s = %s", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+    SAL_INFO("fpicker.aqua",">>> " << 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 int value2) {
-    OSL_TRACE(">>> %s::%s%s%s = %d%s%s = %d", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+    SAL_INFO("fpicker.aqua",">>> " << 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 char* value2) {
-    OSL_TRACE(">>> %s::%s%s%s = %d%s%s = %s", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+    SAL_INFO("fpicker.aqua",">>> " << 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)
 {
-    OSL_TRACE(">>> %s::%s%s%s = %d%s%s =", 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
     CFShow(value2);
 #endif
@@ -115,7 +115,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);
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1 << PARAMFILLER << param2 << " =" << value2);
 #if OSL_DEBUG_LEVEL > 1
     NSLog(value2);
 #endif
@@ -123,59 +123,59 @@ 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 OUString& value1, const char* param2, const 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());
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname <<  PARAMFILLER << param1 << " = " << OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr() << PARAMFILLER << param2 << " = " << OUStringToOString(value2, RTL_TEXTENCODING_UTF8).getStr());
 }
 
 inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const OUString& value1, const char* param2, const int value2) {
-    OSL_TRACE(">>> %s::%s%s%s = %s%s%s = %d", classname, methodname, PARAMFILLER, param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr(), PARAMFILLER, param2, value2);
+    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr() << PARAMFILLER << param2 <<" = " << value2);
 }
 
 //exit method debugs
 
 inline void DBG_PRINT_EXIT() {
-    OSL_TRACE("<<< %s", __func__);
+    SAL_INFO("fpicker.aqua","<<< " << __func__);
 }
 
 inline void DBG_PRINT_EXIT(const char * classname, const char * methodname) {
-    OSL_TRACE("<<< %s::%s", classname, methodname);
+    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname);
 }
 
 inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const char* retVal) {
-    OSL_TRACE("<<< %s::%s%sreturnValue = %s", classname, methodname, PARAMFILLER, retVal);
+    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = " << retVal);
 }
 
 inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, int retVal) {
-    OSL_TRACE("<<< %s::%s%sreturnValue = %d", classname, methodname, PARAMFILLER, retVal);
+    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = " << retVal);
 }
 
 #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);
+    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = ");
     CFShow(retVal);
 }
 #else
 inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const CFStringRef /* retVal */)
 {
-    OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
+    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = ");
 }
 #endif
 
 #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);
+    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = ");
     NSLog(retVal);
 }
 #else
 inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* /* retVal */ )
 {
-    OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
+    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = ");
 }
 #endif
 
 inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const OUString& retVal) {
-    OSL_TRACE("<<< %s::%s%sreturnValue = %s", classname, methodname, PARAMFILLER, OUStringToOString(retVal, RTL_TEXTENCODING_UTF8).getStr());
+    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = " << OUStringToOString(retVal, RTL_TEXTENCODING_UTF8).getStr());
 }
 
 #endif //_CFSTRINGUTILITIES_HXX_

fpicker/source/aqua/CFStringUtilities.mm

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/diagnose.h>
+#include "sal/log.hxx"
 #include "CFStringUtilities.hxx"
 
 rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
@@ -29,7 +29,7 @@ rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
 
     CFRetain(sOrig);
     CFIndex nFileNameLength = CFStringGetLength(sOrig);
-    //OSL_TRACE("FH: string length: %d", (int)(nFileNameLength));
+    //SAL_INFO("fpicker.aqua","FH: string length: " << (int)(nFileNameLength));
     UniChar unichars[nFileNameLength+1];
     //'close' the string buffer correctly
     unichars[nFileNameLength] = '\0';
@@ -78,13 +78,13 @@ rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
 
     switch(info) {
         case FULLPATH:
-            OSL_TRACE("Extracting the full path of an item");
+            SAL_INFO("fpicker.aqua","Extracting the full path of an item");
             sURLString = CFURLGetString(aUrlRef);
             CFRetain(sURLString);
             break;
         case FILENAME:
             {
-                OSL_TRACE("Extracting the file name of an item");
+                SAL_INFO("fpicker.aqua","Extracting the file name of an item");
                 CFStringRef fullString = CFURLGetString(aUrlRef);
                 CFURLRef dirRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
                 CFIndex dirLength = CFStringGetLength(CFURLGetString(dirRef));
@@ -96,7 +96,7 @@ rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
             break;
         case PATHWITHOUTLASTCOMPONENT:
             {
-                OSL_TRACE("Extracting the last but one component of an item's path");
+                SAL_INFO("fpicker.aqua","Extracting the last but one component of an item's path");
                 CFURLRef directoryRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
                 sURLString = CFURLGetString(directoryRef);
                 CFRetain(sURLString);

fpicker/source/aqua/NSURL_OOoAdditions.mm

@@ -22,6 +22,7 @@
 #endif
 
 #include "NSURL_OOoAdditions.hxx"
+#include "sal/log.hxx"
 
 @implementation NSURL (OOoAdditions)
 - (rtl::OUString) OUStringForInfo:(InfoType)info
@@ -32,13 +33,13 @@
 
     switch(info) {
         case FULLPATH:
-            OSL_TRACE("Extracting the full path of an item");
+            SAL_INFO("fpicker.aqua","Extracting the full path of an item");
             sURLString = [self absoluteString];
             [sURLString retain];
             break;
         case FILENAME:
             {
-                OSL_TRACE("Extracting the file name of an item");
+                SAL_INFO("fpicker.aqua","Extracting the file name of an item");
                 NSString *path = [self path];
                 if (path == nil) {
                     sURLString = @"";
@@ -51,7 +52,7 @@
             break;
         case PATHWITHOUTLASTCOMPONENT:
             {
-                OSL_TRACE("Extracting the last but one component of an item's path");
+                SAL_INFO("fpicker.aqua","Extracting the last but one component of an item's path");
                 NSString *path = [self absoluteString];
                 if (path == nil) {
                     sURLString = @"";

sal/inc/sal/log-areas.dox

@@ -92,6 +92,7 @@ certain functionality.
 
 @section fpicker
 
+@li @c fpicker.aqua
 @li @c fpicker.office
 
 @section i18npool