Bin overly verbose function entry/exit debug print macros

Change-Id: Icdbb9344a669e5f78d5db85dc555e91a56ded34c

fpicker/source/aqua/CFStringUtilities.hxx

@@ -26,7 +26,6 @@
 #include <postmac.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include "sal/log.hxx"
 
 enum InfoType {
     FULLPATH,
@@ -39,145 +38,6 @@ OUString FSRefToOUString(FSRef const & fsRef, InfoType info = FULLPATH);
 OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info);
 CFStringRef CFStringCreateWithOUString(const OUString& aString);
 
-//debug utils
-#define PARAMFILLER "\n                    "
-
-inline void DBG_PRINT_ENTRY() {
-    SAL_INFO("fpicker.aqua",">>> "<< __func__);
-}
-
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname) {
-    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname);
-}
-
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const char* 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) {
-    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)
-{
-    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 */)
-{
-    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)
-{
-    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " =");
-    NSLog(const_cast<NSString*>(value1));
-}
-#else
-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 << " =");
-}
-#endif
-
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int 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) {
-    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) {
-    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) {
-    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) {
-    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)
-{
-    SAL_INFO("fpicker.aqua",">>> " << 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)
-{
-    SAL_INFO("fpicker.aqua",">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1 << PARAMFILLER << param2 << " =" << value2);
-#if OSL_DEBUG_LEVEL > 1
-    NSLog( const_cast<NSString*>(value2));
-#endif
-}
-
-
-inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const OUString& value1, const char* param2, const OUString& value2) {
-    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) {
-    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() {
-    SAL_INFO("fpicker.aqua","<<< " << __func__);
-}
-
-inline void DBG_PRINT_EXIT(const char * classname, const char * methodname) {
-    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname);
-}
-
-inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const char* retVal) {
-    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER "returnValue = " << retVal);
-}
-
-inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, int 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)
-{
-    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 */)
-{
-    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)
-{
-    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER "returnValue = ");
-    NSLog(const_cast<NSString*>(retVal));
-}
-#else
-inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* /* retVal */ )
-{
-    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER "returnValue = ");
-}
-#endif
-
-inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const OUString& retVal) {
-    SAL_INFO("fpicker.aqua","<<< " << classname << "::" << methodname << PARAMFILLER "returnValue = " << OUStringToOString(retVal, RTL_TEXTENCODING_UTF8).getStr());
-}
-
 #endif // INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

fpicker/source/aqua/CFStringUtilities.mm

@@ -20,9 +20,8 @@
 #include "sal/log.hxx"
 #include "CFStringUtilities.hxx"
 
-rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
-    //DBG_PRINT_ENTRY("CFStringUtilities", __func__, "sOrig", sOrig);
-
+rtl::OUString CFStringToOUString(const CFStringRef sOrig)
+{
     if (nullptr == sOrig) {
         return rtl::OUString();
     }
@@ -39,25 +38,18 @@ rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
     //we no longer need the original string
     CFRelease(sOrig);
 
-    //DBG_PRINT_EXIT("CFStringUtilities", __func__, unichars);
-
     return rtl::OUString(reinterpret_cast<sal_Unicode *>(unichars));
 }
 
-CFStringRef CFStringCreateWithOUString(const rtl::OUString& aString) {
-    //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
-
+CFStringRef CFStringCreateWithOUString(const rtl::OUString& aString)
+{
     CFStringRef ref = CFStringCreateWithCharacters(kCFAllocatorDefault, reinterpret_cast<UniChar const *>(aString.getStr()), aString.getLength());
 
-    //DBG_PRINT_EXIT("CFStringUtilities", __func__, ref);
-
     return ref;
 }
 
 rtl::OUString FSRefToOUString(FSRef const & fsRef, InfoType info)
 {
-    //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
-
     SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 CFURLCreateFromFSRef
     CFURLRef aUrlRef = CFURLCreateFromFSRef(nullptr, &fsRef);
     SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -67,15 +59,11 @@ rtl::OUString FSRefToOUString(FSRef const & fsRef, InfoType info)
     //we no longer need the CFURLRef
     CFRelease(aUrlRef);
 
-    //DBG_PRINT_EXIT("CFStringUtilities", __func__, OUStringToOString(sResult, RTL_TEXTENCODING_UTF8).getStr());
-
     return sResult;
 }
 
 rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
 {
-    //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
-
     CFStringRef sURLString = nullptr;
 
     switch(info) {
@@ -113,8 +101,6 @@ rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
 
     CFRelease(sURLString);
 
-    //DBG_PRINT_EXIT("CFStringUtilities", __func__, OUStringToOString(sResult, RTL_TEXTENCODING_UTF8).getStr());
-
     return sResult;
 }
 

fpicker/source/aqua/FilterHelper.mm

@@ -43,7 +43,6 @@ void fillSuffixList(OUStringList& aSuffixList, const ::rtl::OUString& suffixStri
 }
 
 #pragma mark DEFINES
-#define CLASS_NAME "FilterEntry"
 
 #pragma mark FilterEntry
 
@@ -51,8 +50,6 @@ FilterEntry::FilterEntry( const rtl::OUString& _rTitle, const UnoFilterList& _rS
 :m_sTitle( _rTitle )
 ,m_aSubFilters( _rSubFilters )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", _rTitle);
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 
@@ -67,13 +64,9 @@ bool FilterEntry::hasSubFilters() const
 
 sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     _rSubFilterList = m_aSubFilters;
     sal_Int32 nReturn = m_aSubFilters.getLength();
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__, nReturn);
-
     return nReturn;
 }
 
@@ -106,8 +99,6 @@ isFilterString( const rtl::OUString& rFilterString, const char *pMatch )
 static rtl::OUString
 shrinkFilterName( const rtl::OUString& aFilterName, bool bAllowNoStar = false )
 {
-    // DBG_PRINT_ENTRY(CLASS_NAME, "shrinkFilterName", "filterName", aFilterName);
-
     sal_Int32 nBracketEnd = -1;
     rtl::OUString aRealName(aFilterName);
 
@@ -178,21 +169,14 @@ public:
     };
 }
 
-#undef CLASS_NAME
-#define CLASS_NAME "FilterHelper"
-
 FilterHelper::FilterHelper()
 : m_pFilterList(nullptr)
 , m_pFilterNames(nullptr)
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 FilterHelper::~FilterHelper()
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     NSAutoreleasePool *pool = [NSAutoreleasePool new];
 
     if (nullptr != m_pFilterList) {
@@ -208,8 +192,6 @@ FilterHelper::~FilterHelper()
     }
 
     [pool release];
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 
@@ -264,8 +246,6 @@ void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilt
 
 void FilterHelper::SetCurFilter( const rtl::OUString& rFilter )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "filter", rFilter);
-
     SolarMutexGuard aGuard;
 
     if(!m_aCurrentFilter.equals(rFilter))
@@ -290,14 +270,10 @@ void FilterHelper::SetCurFilter( const rtl::OUString& rFilter )
         OSL_TRACE("No filter entry was found for that name!");
     }
 #endif
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 void FilterHelper::SetFilters()
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     // set the default filter
     if( m_aCurrentFilter.getLength() > 0 )
     {
@@ -305,14 +281,11 @@ void FilterHelper::SetFilters()
 
         SetCurFilter( m_aCurrentFilter );
     }
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilterString)
-throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", aTitle, "filter", aFilterString);
-
+throw( css::lang::IllegalArgumentException, css::uno::RuntimeException )
+{
     SolarMutexGuard aGuard;
 
     if( FilterNameExists( aTitle ) ) {
@@ -326,35 +299,25 @@ throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) {
     OUStringList suffixList;
     fillSuffixList(suffixList, aFilterString);
     m_pFilterList->push_back(FilterEntry( aTitle, suffixList ) );
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 void FilterHelper::setCurrentFilter( const ::rtl::OUString& aTitle )
-throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "aTitle", OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8).getStr());
-
+throw( css::lang::IllegalArgumentException, css::uno::RuntimeException )
+{
     SetCurFilter(aTitle);
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 ::rtl::OUString SAL_CALL FilterHelper::getCurrentFilter(  )
-throw( css::uno::RuntimeException ) {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
+throw( css::uno::RuntimeException )
+{
     ::rtl::OUString sReturn = (m_aCurrentFilter);
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__, OUStringToOString(sReturn, RTL_TEXTENCODING_UTF8).getStr());
-
     return sReturn;
 }
 
-void SAL_CALL FilterHelper::appendFilterGroup( const ::rtl::OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) {
-
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", OUStringToOString(sGroupTitle, RTL_TEXTENCODING_UTF8).getStr());
-
+void SAL_CALL FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters )
+throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
+{
     SolarMutexGuard aGuard;
 
     //add a separator if this is not the first group to be added
@@ -378,14 +341,10 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) {
     for( ; pSubFilters != pSubFiltersEnd; ++pSubFilters ) {
         appendFilter(pSubFilters->First, pSubFilters->Second);
     }
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     if (m_aCurrentFilter == nullptr) {
         OSL_TRACE("filter name is null");
         return true;
@@ -433,21 +392,16 @@ bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
             return true;
     }
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
     return false;
 }
 
-FilterList* FilterHelper::getFilterList() {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
+FilterList* FilterHelper::getFilterList()
+{
     return m_pFilterList;
 }
 
-NSStringList* FilterHelper::getFilterNames() {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
+NSStringList* FilterHelper::getFilterNames()
+{
     if (nullptr == m_pFilterList)
         return nullptr;
     if (nullptr == m_pFilterNames) {
@@ -458,26 +412,20 @@ NSStringList* FilterHelper::getFilterNames() {
         }
     }
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
     return m_pFilterNames;
 }
 
-void FilterHelper::SetFilterAtIndex(unsigned index) {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "index", index);
-
+void FilterHelper::SetFilterAtIndex(unsigned index)
+{
     if (m_pFilterList->size() <= index) {
         index = 0;
     }
     FilterEntry entry = m_pFilterList->at(index);
     SetCurFilter(entry.getTitle());
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
-int FilterHelper::getCurrentFilterIndex() {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
+int FilterHelper::getCurrentFilterIndex()
+{
     int result = 0;//default to first filter
     if (m_aCurrentFilter.getLength() > 0) {
         int i = 0;
@@ -496,14 +444,11 @@ int FilterHelper::getCurrentFilterIndex() {
         }
     }
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__, result);
-
     return result;
 }
 
-OUStringList FilterHelper::getCurrentFilterSuffixList() {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
+OUStringList FilterHelper::getCurrentFilterSuffixList()
+{
     OUStringList retVal;
     if (m_aCurrentFilter.getLength() > 0) {
         for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); iter++) {
@@ -521,8 +466,6 @@ OUStringList FilterHelper::getCurrentFilterSuffixList() {
         }
     }
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
     return retVal;
 }
 

fpicker/source/aqua/NSString_OOoAdditions.mm

@@ -20,17 +20,12 @@
 #include "CFStringUtilities.hxx"
 #include "NSString_OOoAdditions.hxx"
 
-#define CLASS_NAME "NSString"
-
 @implementation NSString (OOoAdditions) 
 
 + (id) stringWithOUString:(const rtl::OUString&)ouString
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "ouString", ouString);
-
     NSString *string = [[NSString alloc] initWithCharacters:reinterpret_cast<unichar const *>(ouString.getStr()) length:ouString.getLength()];
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__, string);
     return [string autorelease];
 }
 

fpicker/source/aqua/SalAquaFolderPicker.mm

@@ -42,8 +42,6 @@
 #include "NSURL_OOoAdditions.hxx"
 
 #pragma mark DEFINES
-#define CLASS_NAME "SalAquaFolderPicker"
-
 
 // namespace directives
 
@@ -75,11 +73,7 @@ namespace
 SalAquaFolderPicker::SalAquaFolderPicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr ) :
     m_xServiceMgr( xServiceMgr )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     m_nDialogType = NAVIGATIONSERVICES_DIRECTORY;
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 
@@ -88,19 +82,13 @@ SalAquaFolderPicker::SalAquaFolderPicker( const uno::Reference<lang::XMultiServi
 
 void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", aTitle);
-
     SolarMutexGuard aGuard;
 
     implsetTitle(aTitle);
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     SolarMutexGuard aGuard;
 
     sal_Int16 retVal = 0;
@@ -132,7 +120,6 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
         break;
     }
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
     return retVal;
 }
 
@@ -143,32 +130,22 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
 void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "directory", aDirectory);
-
     SolarMutexGuard aGuard;
 
     implsetDisplayDirectory(aDirectory);
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory() throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     SolarMutexGuard aGuard;
 
     OUString aDirectory = implgetDisplayDirectory();
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__, aDirectory);
-
     return aDirectory;
 }
 
 rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     SolarMutexGuard aGuard;
 
     NSArray *files = nil;
@@ -194,18 +171,13 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeEx
 
     OSL_TRACE("dir url: %s", OUStringToOString(aDirectory, RTL_TEXTENCODING_UTF8).getStr());
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
     return aDirectory;
 }
 
 void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescription )
     throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "description", rDescription);
-
     [m_pDialog setMessage:[NSString stringWithOUString:rDescription]];
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 
@@ -215,12 +187,8 @@ void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescrip
 rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
     throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     rtl::OUString retVal( FOLDER_PICKER_IMPL_NAME );
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
-
     return retVal;
 }
 
@@ -233,9 +201,6 @@ sal_Bool SAL_CALL SalAquaFolderPicker::supportsService( const rtl::OUString& sSe
 uno::Sequence<rtl::OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNames()
     throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
     return FolderPicker_getSupportedServiceNames();
 }
 
@@ -245,13 +210,9 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNa
 
 void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     SolarMutexGuard aGuard;
 
     [m_pDialog cancel:nil];
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 
@@ -261,8 +222,6 @@ void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException )
 void SAL_CALL SalAquaFolderPicker::disposing( const lang::EventObject& )
     throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

fpicker/source/aqua/SalAquaPicker.mm

@@ -39,7 +39,6 @@
 #include <stdio.h>
 
 #pragma mark DEFINES
-#define CLASS_NAME "SalAquaPicker"
 #define kSetHideExtensionStateKey @"NSNavLastUserSetHideExtensionButtonState"
 
 
@@ -55,14 +54,10 @@ SalAquaPicker::SalAquaPicker()
 : m_pDialog(nullptr)
 , m_pControlHelper(new ControlHelper())
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 SalAquaPicker::~SalAquaPicker()
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     SolarMutexGuard aGuard;
 
     NSAutoreleasePool *pool = [NSAutoreleasePool new];
@@ -74,14 +69,10 @@ SalAquaPicker::~SalAquaPicker()
         [m_pDialog release];
 
     [pool release];
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 void SAL_CALL SalAquaPicker::implInitialize()
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     SolarMutexGuard aGuard;
 
     if (m_pDialog != nil) {
@@ -140,14 +131,10 @@ void SAL_CALL SalAquaPicker::implInitialize()
         //Retain the dialog instance or it will go away immediately
         [m_pDialog retain];
     }
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 int SalAquaPicker::run()
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     SolarMutexGuard aGuard;
 
     NSAutoreleasePool *pool = [NSAutoreleasePool new];
@@ -197,7 +184,6 @@ int SalAquaPicker::run()
             implsetDisplayDirectory([pDir OUStringForInfo:FULLPATH]);
         }
     }
-    DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
 
     [pool release];
 
@@ -206,49 +192,35 @@ int SalAquaPicker::run()
 
 int SalAquaPicker::runandwaitforresult()
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
     SolarMutexGuard aGuard;
 
     int status = this->run();
 
-    DBG_PRINT_EXIT(CLASS_NAME, __func__, status);
     return status;
 }
 
 void SAL_CALL SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "directory", aDirectory);
-
     SolarMutexGuard aGuard;
 
     if (aDirectory != m_sDisplayDirectory) {
         m_sDisplayDirectory = aDirectory;
     }
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 rtl::OUString SAL_CALL SalAquaPicker::implgetDisplayDirectory() throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-    DBG_PRINT_EXIT(CLASS_NAME, __func__, m_sDisplayDirectory);
-
     return m_sDisplayDirectory;
 }
 
 void SAL_CALL SalAquaPicker::implsetTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException )
 {
-    DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", aTitle);
-
     SolarMutexGuard aGuard;
 
     if (m_pDialog != nil) {
         [m_pDialog setTitle:[NSString stringWithOUString:aTitle]];
     }
-
-    DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */