[Libreoffice-commits] core.git: 2 commits - fpicker/source
Tor Lillqvist
tml at collabora.com
Mon Mar 7 07:45:52 UTC 2016
fpicker/source/aqua/CFStringUtilities.hxx | 140 -----------------------
fpicker/source/aqua/CFStringUtilities.mm | 22 ---
fpicker/source/aqua/ControlHelper.mm | 91 ---------------
fpicker/source/aqua/FilterHelper.mm | 100 +++-------------
fpicker/source/aqua/NSString_OOoAdditions.mm | 5
fpicker/source/aqua/SalAquaFilePicker.mm | 163 +--------------------------
fpicker/source/aqua/SalAquaFolderPicker.mm | 46 -------
fpicker/source/aqua/SalAquaPicker.mm | 38 ------
8 files changed, 38 insertions(+), 567 deletions(-)
New commits:
commit 9ffb33a5f041d2a4d9516ab163d9967afd0404dc
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 7 09:43:32 2016 +0200
Bin overly verbose OSL_TRACEs of questionable usefulness
Change-Id: Ic535aef31c2a8d73f9c496ffdc535494c15d3c12
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index 25f9b8a..ca91f7a 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -55,9 +55,8 @@ FilterEntry::FilterEntry( const rtl::OUString& _rTitle, const UnoFilterList& _rS
bool FilterEntry::hasSubFilters() const
{
-// OSL_TRACE(">>> FilterEntry::%s", __func__);
bool bReturn = ( 0 < m_aSubFilters.getLength() );
-// OSL_TRACE("<<< FilterEntry::%s retVal: %d", __func__, bReturn);
+
return bReturn;
}
@@ -232,7 +231,6 @@ bool FilterHelper::FilterNameExists( const UnoFilterList& _rGroupedFilters )
void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter )
{
- //OSL_TRACE(">>> FilterHelper::%s", __func__);
if( nullptr == m_pFilterList )
{
m_pFilterList = new FilterList;
@@ -241,7 +239,6 @@ void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilt
m_aCurrentFilter = _rInitialCurrentFilter;
OSL_TRACE("ensureFilterList filter:%s", OUStringToOString(m_aCurrentFilter, RTL_TEXTENCODING_UTF8).getStr());
}
- //OSL_TRACE("<<< FilterHelper::%s", __func__);
}
void FilterHelper::SetCurFilter( const rtl::OUString& rFilter )
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 8ac9b61..78ec4f8 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -165,14 +165,8 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
if (m_sSaveFileName.getLength() > 0) {
setDefaultName(m_sSaveFileName);
}
- } else {
- OSL_TRACE("no dash present in window title");
}
- } else {
- OSL_TRACE("couldn't get window title");
}
- } else {
- OSL_TRACE("no front window found");
}
}
}
@@ -197,7 +191,6 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
#else
case NSOKButton:
#endif
- OSL_TRACE("The dialog returned OK");
retVal = ExecutableDialogResults::OK;
break;
@@ -206,7 +199,6 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
#else
case NSCancelButton:
#endif
- OSL_TRACE("The dialog was cancelled by the user!");
retVal = ExecutableDialogResults::CANCEL;
break;
@@ -232,7 +224,6 @@ void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ ) t
if (m_nDialogType == NAVIGATIONSERVICES_OPEN) {
[(NSOpenPanel*)m_pDialog setAllowsMultipleSelection:YES];
- OSL_TRACE("dialog allows multi-selection? %d", [(NSOpenPanel*)m_pDialog allowsMultipleSelection]);
}
}
@@ -285,7 +276,6 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() thro
}
#endif
- // OSL_TRACE("starting work");
NSArray *files = nil;
if (m_nDialogType == NAVIGATIONSERVICES_OPEN) {
files = [(NSOpenPanel*)m_pDialog URLs];
@@ -325,14 +315,11 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() thro
}
#endif
- OSL_TRACE("handling %s", [[url description] UTF8String]);
InfoType info = FULLPATH;
OUString sFileOrDirURL = [url OUStringForInfo:info];
aSelectedFiles[nIndex] = sFileOrDirURL;
-
- OSL_TRACE("Returned file in getFiles: \"%s\".", OUStringToOString(sFileOrDirURL, RTL_TEXTENCODING_UTF8).getStr());
}
return aSelectedFiles;
@@ -356,9 +343,6 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
void SAL_CALL SalAquaFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
throw( lang::IllegalArgumentException, uno::RuntimeException )
{
- OSL_TRACE( "Setting current filter to %s",
- OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ).getStr() );
-
SolarMutexGuard aGuard;
ensureFilterHelper();
@@ -468,47 +452,36 @@ throw( uno::Exception, uno::RuntimeException )
{
case FILEOPEN_SIMPLE:
m_nDialogType = NAVIGATIONSERVICES_OPEN;
- OSL_TRACE( "Template: FILEOPEN_SIMPLE" );
break;
case FILESAVE_SIMPLE:
m_nDialogType = NAVIGATIONSERVICES_SAVE;
- OSL_TRACE( "Template: FILESAVE_SIMPLE" );
break;
case FILESAVE_AUTOEXTENSION_PASSWORD:
m_nDialogType = NAVIGATIONSERVICES_SAVE;
- OSL_TRACE( "Template: FILESAVE_AUTOEXTENSION_PASSWORD" );
break;
case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS:
m_nDialogType = NAVIGATIONSERVICES_SAVE;
- OSL_TRACE( "Template: FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS" );
break;
case FILESAVE_AUTOEXTENSION_SELECTION:
m_nDialogType = NAVIGATIONSERVICES_SAVE;
- OSL_TRACE( "Template: FILESAVE_AUTOEXTENSION_SELECTION" );
break;
case FILESAVE_AUTOEXTENSION_TEMPLATE:
m_nDialogType = NAVIGATIONSERVICES_SAVE;
- OSL_TRACE( "Template: FILESAVE_AUTOEXTENSION_TEMPLATE" );
break;
case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE:
m_nDialogType = NAVIGATIONSERVICES_OPEN;
- OSL_TRACE( "Template: FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE" );
break;
case FILEOPEN_PLAY:
m_nDialogType = NAVIGATIONSERVICES_OPEN;
- OSL_TRACE( "Template: FILEOPEN_PLAY" );
break;
case FILEOPEN_READONLY_VERSION:
m_nDialogType = NAVIGATIONSERVICES_OPEN;
- OSL_TRACE( "Template: FILEOPEN_READONLY_VERSION" );
break;
case FILEOPEN_LINK_PREVIEW:
m_nDialogType = NAVIGATIONSERVICES_OPEN;
- OSL_TRACE( "Template: FILEOPEN_LINK_PREVIEW" );
break;
case FILESAVE_AUTOEXTENSION:
m_nDialogType = NAVIGATIONSERVICES_SAVE;
- OSL_TRACE( "Template: FILESAVE_AUTOEXTENSION" );
break;
default:
throw lang::IllegalArgumentException("Unknown template",
@@ -582,28 +555,24 @@ throw( uno::RuntimeException )
void SAL_CALL SalAquaFilePicker::fileSelectionChanged( FilePickerEvent aEvent )
{
- OSL_TRACE( "file selection changed");
if (m_xListener.is())
m_xListener->fileSelectionChanged( aEvent );
}
void SAL_CALL SalAquaFilePicker::directoryChanged( FilePickerEvent aEvent )
{
- OSL_TRACE("directory changed");
if (m_xListener.is())
m_xListener->directoryChanged( aEvent );
}
void SAL_CALL SalAquaFilePicker::controlStateChanged( FilePickerEvent aEvent )
{
- OSL_TRACE("control state changed");
if (m_xListener.is())
m_xListener->controlStateChanged( aEvent );
}
void SAL_CALL SalAquaFilePicker::dialogSizeChanged()
{
- OSL_TRACE("dialog size changed");
if (m_xListener.is())
m_xListener->dialogSizeChanged();
}
@@ -645,7 +614,6 @@ void SalAquaFilePicker::updateSaveFileNameExtension()
SolarMutexGuard aGuard;
if (!m_pControlHelper->isAutoExtensionEnabled()) {
- OSL_TRACE("allowing other file types");
[m_pDialog setAllowedFileTypes:nil];
[m_pDialog setAllowsOtherFileTypes:YES];
} else {
@@ -660,7 +628,6 @@ void SalAquaFilePicker::updateSaveFileNameExtension()
[m_pDialog setAllowedFileTypes:[NSArray arrayWithObjects:requiredFileType, nil]];
- OSL_TRACE("disallowing other file types");
[m_pDialog setAllowsOtherFileTypes:NO];
}
}
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index ef5246c..72f27c7 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -102,7 +102,6 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
#else
case NSOKButton:
#endif
- OSL_TRACE("Dialog returned with OK");
retVal = ExecutableDialogResults::OK;
break;
@@ -111,7 +110,6 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
#else
case NSCancelButton:
#endif
- OSL_TRACE("Dialog was cancelled!");
retVal = ExecutableDialogResults::CANCEL;
break;
@@ -163,14 +161,11 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeEx
rtl::OUString aDirectory;
NSURL *url = [files objectAtIndex:0];
- OSL_TRACE("handling %s", [[url description] UTF8String]);
aDirectory = [url OUStringForInfo:FULLPATH];
implsetDisplayDirectory(aDirectory);
- OSL_TRACE("dir url: %s", OUStringToOString(aDirectory, RTL_TEXTENCODING_UTF8).getStr());
-
return aDirectory;
}
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index f97795a..a7757f9 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -82,14 +82,12 @@ void SAL_CALL SalAquaPicker::implInitialize()
switch (m_nDialogType)
{
case NAVIGATIONSERVICES_OPEN:
- OSL_TRACE("NAVIGATIONSERVICES_OPEN");
m_pDialog = [NSOpenPanel openPanel];
[(NSOpenPanel*)m_pDialog setCanChooseDirectories:NO];
[(NSOpenPanel*)m_pDialog setCanChooseFiles:YES];
break;
case NAVIGATIONSERVICES_SAVE:
- OSL_TRACE("NAVIGATIONSERVICES_SAVE");
m_pDialog = [NSSavePanel savePanel];
[(NSSavePanel*)m_pDialog setCanSelectHiddenExtension:NO]; //changed for issue #102102
/* I would have loved to use
@@ -105,28 +103,22 @@ void SAL_CALL SalAquaPicker::implInitialize()
NSUserDefaults *pDefaults = [NSUserDefaults standardUserDefaults];
NSNumber *pExtn = [pDefaults objectForKey:kSetHideExtensionStateKey];
if(pExtn == nil || [pExtn boolValue] == NO) {
- OSL_TRACE("Hiding extension");
[pDefaults setBool:YES forKey:kSetHideExtensionStateKey];
}
}
break;
case NAVIGATIONSERVICES_DIRECTORY:
- OSL_TRACE("NAVIGATIONSERVICES_DIRECTORY");
m_pDialog = [NSOpenPanel openPanel];
[(NSOpenPanel*)m_pDialog setCanChooseDirectories:YES];
[(NSOpenPanel*)m_pDialog setCanChooseFiles:NO];
break;
default:
- OSL_TRACE("m_nDialogType is UNKNOWN: %d", m_nDialogType);
break;
}
- if (m_pDialog == nil) {
- OSL_TRACE("An error occurred while creating the dialog!");
- }
- else {
+ if (m_pDialog != nil) {
[(NSOpenPanel*)m_pDialog setCanCreateDirectories:YES];
//Retain the dialog instance or it will go away immediately
[m_pDialog retain];
commit b5e280fdd0f14f29d54800adff2c0090c35664bf
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 7 09:15:52 2016 +0200
Bin overly verbose function entry/exit debug print macros
Change-Id: Icdbb9344a669e5f78d5db85dc555e91a56ded34c
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 3c76a81..784487d 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/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: */
diff --git a/fpicker/source/aqua/CFStringUtilities.mm b/fpicker/source/aqua/CFStringUtilities.mm
index ead151e..a9fcd03 100644
--- a/fpicker/source/aqua/CFStringUtilities.mm
+++ b/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;
}
diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm
index af8a002..5727cdf 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -31,7 +31,6 @@
#include "ControlHelper.hxx"
#pragma mark DEFINES
-#define CLASS_NAME "ControlHelper"
#define POPUP_WIDTH_MIN 200
#define POPUP_WIDTH_MAX 350
@@ -44,13 +43,10 @@ namespace {
uno::Any HandleGetListValue(const NSControl* pControl, const sal_Int16 nControlAction)
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlAction", nControlAction);
-
uno::Any aAny;
if ([pControl class] != [NSPopUpButton class]) {
SAL_INFO("fpicker.aqua","not a popup button");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return aAny;
}
@@ -58,7 +54,6 @@ uno::Any HandleGetListValue(const NSControl* pControl, const sal_Int16 nControlA
NSMenu *rMenu = [pButton menu];
if (nil == rMenu) {
SAL_INFO("fpicker.aqua","button has no menu");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return aAny;
}
@@ -108,14 +103,11 @@ uno::Any HandleGetListValue(const NSControl* pControl, const sal_Int16 nControlA
break;
}
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
return aAny;
}
-NSTextField* createLabelWithString(NSString* labelString) {
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "label", labelString);
-
+NSTextField* createLabelWithString(NSString* labelString)
+{
NSTextField *textField = [NSTextField new];
[textField setEditable:NO];
[textField setSelectable:NO];
@@ -125,7 +117,6 @@ NSTextField* createLabelWithString(NSString* labelString) {
[[textField cell] setTitle:labelString];
SAL_WNODEPRECATED_DECLARATIONS_POP
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return textField;
}
@@ -143,8 +134,6 @@ ControlHelper::ControlHelper()
, m_bIsFilterControlNeeded(false)
, m_pFilterHelper(nullptr)
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
int i;
for( i = 0; i < TOGGLE_LAST; i++ ) {
@@ -154,14 +143,10 @@ ControlHelper::ControlHelper()
for( i = 0; i < LIST_LAST; i++ ) {
m_bListVisibility[i] = false;
}
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
ControlHelper::~ControlHelper()
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
NSAutoreleasePool *pool = [NSAutoreleasePool new];
if (nullptr != m_pUserPane) {
@@ -188,8 +173,6 @@ ControlHelper::~ControlHelper()
}
[pool release];
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
#pragma mark XInitialization delegate
@@ -198,8 +181,6 @@ ControlHelper::~ControlHelper()
void ControlHelper::initialize( sal_Int16 nTemplateId )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "templateId", nTemplateId);
-
switch( nTemplateId )
{
case FILESAVE_AUTOEXTENSION_PASSWORD:
@@ -238,8 +219,6 @@ void ControlHelper::initialize( sal_Int16 nTemplateId )
}
createControls();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
#pragma mark XFilePickerControlAccess delegates
@@ -249,13 +228,10 @@ void ControlHelper::initialize( sal_Int16 nTemplateId )
void ControlHelper::enableControl( const sal_Int16 nControlId, const bool bEnable ) const
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "enable", int(bEnable));
-
SolarMutexGuard aGuard;
if (nControlId == ExtendedFilePickerElementIds::CHECKBOX_PREVIEW) {
SAL_INFO("fpicker.aqua"," preview checkbox cannot be changed");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return;
}
@@ -271,14 +247,10 @@ void ControlHelper::enableControl( const sal_Int16 nControlId, const bool bEnabl
} else {
SAL_INFO("fpicker.aqua","enable unknown control " << nControlId );
}
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
OUString ControlHelper::getLabel( sal_Int16 nControlId )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId);
-
SolarMutexGuard aGuard;
NSControl* pControl = getControl( nControlId );
@@ -301,15 +273,11 @@ OUString ControlHelper::getLabel( sal_Int16 nControlId )
retVal = [sLabel OUString];
}
- DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
-
return retVal;
}
void ControlHelper::setLabel( sal_Int16 nControlId, NSString* aLabel )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "label", aLabel);
-
SolarMutexGuard aGuard;
NSAutoreleasePool *pool = [NSAutoreleasePool new];
@@ -336,14 +304,10 @@ void ControlHelper::setLabel( sal_Int16 nControlId, NSString* aLabel )
layoutControls();
[pool release];
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
void ControlHelper::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "controlAction", nControlAction);
-
SolarMutexGuard aGuard;
if (nControlId == ExtendedFilePickerElementIds::CHECKBOX_PREVIEW) {
@@ -368,14 +332,10 @@ void ControlHelper::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, co
}
}
}
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
uno::Any ControlHelper::getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) const
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "controlAction", nControlAction);
-
SolarMutexGuard aGuard;
uno::Any aRetval;
@@ -395,24 +355,18 @@ uno::Any ControlHelper::getValue( sal_Int16 nControlId, sal_Int16 nControlAction
}
}
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
return aRetval;
}
void ControlHelper::createUserPane()
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
if (!m_bUserPaneNeeded) {
SAL_INFO("fpicker.aqua","no user pane needed");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return;
}
if (nil != m_pUserPane) {
SAL_INFO("fpicker.aqua","user pane already exists");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return;
}
@@ -555,8 +509,6 @@ void ControlHelper::createUserPane()
[m_pUserPane setFrame:upRect];
layoutControls();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
#pragma mark Private / Misc
@@ -565,8 +517,6 @@ void ControlHelper::createUserPane()
void ControlHelper::createControls()
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
CResourceProvider aResProvider;
for (int i = 0; i < LIST_LAST; i++) {
if (m_bListVisibility[i]) {
@@ -627,25 +577,19 @@ void ControlHelper::createControls()
[pPreviewBox setEnabled:NO];
[(NSButton*)pPreviewBox setState:NSOnState];
}
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
#define TOGGLE_ELEMENT( elem ) \
case elem: \
nReturn = CHECKBOX_##elem; \
- DBG_PRINT_EXIT(CLASS_NAME, __func__, nReturn); \
return nReturn
#define LIST_ELEMENT( elem ) \
case elem: \
nReturn = LISTBOX_##elem##_LABEL; \
- DBG_PRINT_EXIT(CLASS_NAME, __func__, nReturn); \
return nReturn
int ControlHelper::getControlElementName(const Class aClazz, const int nControlId)
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "aClazz", [[aClazz description] UTF8String], "controlId", nControlId);
-
int nReturn = -1;
if (aClazz == [NSButton class])
{
@@ -668,18 +612,13 @@ int ControlHelper::getControlElementName(const Class aClazz, const int nControlI
}
}
- DBG_PRINT_EXIT(CLASS_NAME, __func__, nReturn);
-
return nReturn;
}
void ControlHelper::HandleSetListValue(const NSControl* pControl, const sal_Int16 nControlAction, const uno::Any& rValue)
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlAction", nControlAction);
-
if ([pControl class] != [NSPopUpButton class]) {
SAL_INFO("fpicker.aqua","not a popup menu");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return;
}
@@ -687,7 +626,6 @@ void ControlHelper::HandleSetListValue(const NSControl* pControl, const sal_Int1
NSMenu *rMenu = [pButton menu];
if (nil == rMenu) {
SAL_INFO("fpicker.aqua","button has no menu");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return;
}
@@ -733,7 +671,6 @@ void ControlHelper::HandleSetListValue(const NSControl* pControl, const sal_Int1
int nItems = [rMenu numberOfItems];
if (nItems == 0) {
SAL_INFO("fpicker.aqua","no menu items to delete");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return;
}
for(sal_Int32 i = 0; i < nItems; i++) {
@@ -755,15 +692,11 @@ void ControlHelper::HandleSetListValue(const NSControl* pControl, const sal_Int1
}
layoutControls();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
// cf. offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl
NSControl* ControlHelper::getControl( const sal_Int16 nControlId ) const
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId);
-
NSControl* pWidget = nil;
#define MAP_TOGGLE( elem ) \
@@ -803,26 +736,20 @@ case ExtendedFilePickerElementIds::LISTBOX_##elem##_LABEL: \
}
#undef MAP
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
return pWidget;
}
void ControlHelper::layoutControls()
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
SolarMutexGuard aGuard;
if (nil == m_pUserPane) {
SAL_INFO("fpicker.aqua","no user pane to layout");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return;
}
if (m_bIsUserPaneLaidOut) {
SAL_INFO("fpicker.aqua","user pane already laid out");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return;
}
@@ -931,13 +858,10 @@ void ControlHelper::layoutControls()
}
m_bIsUserPaneLaidOut = true;
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
-void ControlHelper::createFilterControl() {
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
+void ControlHelper::createFilterControl()
+{
CResourceProvider aResProvider;
NSString* sLabel = aResProvider.getResString(CommonFilePickerElementIds::LISTBOX_FILTER_LABEL);
@@ -962,8 +886,6 @@ void ControlHelper::createFilterControl() {
// always add the filter as first item
m_aActiveControls.push_front(m_pFilterControl);
m_aMapListLabels[m_pFilterControl] = [sLabel retain];
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
int ControlHelper::getVerticalDistance(const NSControl* first, const NSControl* second)
@@ -993,11 +915,8 @@ int ControlHelper::getVerticalDistance(const NSControl* first, const NSControl*
void ControlHelper::updateFilterUI()
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
if (!m_bIsFilterControlNeeded || m_pFilterHelper == nullptr) {
SAL_INFO("fpicker.aqua","no filter control needed or no filter helper present");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return;
}
@@ -1008,8 +927,6 @@ void ControlHelper::updateFilterUI()
}
[m_pFilterControl selectItemAtIndex:index];
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index e0b7773..25f9b8a 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/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;
}
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.mm
index 7b7a891..99075d3 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.mm
+++ b/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];
}
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 915e224..8ac9b61 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -51,9 +51,6 @@
#pragma mark DEFINES
-#define CLASS_NAME "SalAquaFilePicker"
-
-
// namespace directives
@@ -91,24 +88,16 @@ SalAquaFilePicker::SalAquaFilePicker()
: SalAquaFilePicker_Base( m_rbHelperMtx )
, m_pFilterHelper( nullptr )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
m_pDelegate = [[AquaFilePickerDelegate alloc] initWithFilePicker:this];
m_pControlHelper->setFilePickerDelegate(m_pDelegate);
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
SalAquaFilePicker::~SalAquaFilePicker()
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
if (nullptr != m_pFilterHelper)
delete m_pFilterHelper;
[m_pDelegate release];
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
@@ -120,23 +109,15 @@ SalAquaFilePicker::~SalAquaFilePicker()
void SAL_CALL SalAquaFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
SolarMutexGuard aGuard;
m_xListener = xListener;
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& )
throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
SolarMutexGuard aGuard;
m_xListener.clear();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
#pragma mark XAsynchronousExecutableDialog
@@ -145,18 +126,12 @@ void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference<
void SAL_CALL SalAquaFilePicker::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 SalAquaFilePicker::execute() throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
SolarMutexGuard aGuard;
sal_Int16 retVal = 0;
@@ -242,8 +217,6 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
break;
}
- DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
-
return retVal;
}
@@ -253,72 +226,52 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
// XFilePicker functions
-void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ ) throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "multiSelectable?", int(bMode));
-
SolarMutexGuard aGuard;
if (m_nDialogType == NAVIGATIONSERVICES_OPEN) {
[(NSOpenPanel*)m_pDialog setAllowsMultipleSelection:YES];
OSL_TRACE("dialog allows multi-selection? %d", [(NSOpenPanel*)m_pDialog allowsMultipleSelection]);
}
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
void SAL_CALL SalAquaFilePicker::setDefaultName( const rtl::OUString& aName )
throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "name", aName);
-
SolarMutexGuard aGuard;
m_sSaveFileName = aName;
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
void SAL_CALL SalAquaFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory )
throw( lang::IllegalArgumentException, uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "directory", rDirectory);
-
SolarMutexGuard aGuard;
implsetDisplayDirectory(rDirectory);
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
rtl::OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory() throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
rtl::OUString retVal = implgetDisplayDirectory();
- DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
return retVal;
}
uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
uno::Sequence< rtl::OUString > aSelectedFiles = getSelectedFiles();
// multiselection doesn't really work with getFiles
// so just retrieve the first url
if (aSelectedFiles.getLength() > 1)
aSelectedFiles.realloc(1);
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return aSelectedFiles;
}
uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() throw( uno::RuntimeException, std::exception )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
SolarMutexGuard aGuard;
#if HAVE_FEATURE_MACOSX_SANDBOX
@@ -382,7 +335,6 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() thro
OSL_TRACE("Returned file in getFiles: \"%s\".", OUStringToOString(sFileOrDirURL, RTL_TEXTENCODING_UTF8).getStr());
}
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return aSelectedFiles;
}
@@ -394,21 +346,16 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() thro
void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter )
throw( lang::IllegalArgumentException, uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
SolarMutexGuard aGuard;
ensureFilterHelper();
m_pFilterHelper->appendFilter( aTitle, aFilter );
m_pControlHelper->setFilterControlNeeded(true);
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
void SAL_CALL SalAquaFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
throw( lang::IllegalArgumentException, uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
OSL_TRACE( "Setting current filter to %s",
OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -419,18 +366,14 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
updateFilterUI();
updateSaveFileNameExtension();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
SolarMutexGuard aGuard;
ensureFilterHelper();
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return m_pFilterHelper->getCurrentFilter();
}
@@ -442,13 +385,11 @@ rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() throw( uno::Runtime
void SAL_CALL SalAquaFilePicker::appendFilterGroup( const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters )
throw( lang::IllegalArgumentException, uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
SolarMutexGuard aGuard;
ensureFilterHelper();
m_pFilterHelper->appendFilterGroup(sGroupTitle, aFilters);
m_pControlHelper->setFilterControlNeeded(true);
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
#pragma mark XFilePickerControlAccess
@@ -459,8 +400,6 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
void SAL_CALL SalAquaFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue )
throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
SolarMutexGuard aGuard;
m_pControlHelper->setValue(nControlId, nControlAction, rValue);
@@ -468,50 +407,34 @@ throw( uno::RuntimeException )
if (nControlId == ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION && m_nDialogType == NAVIGATIONSERVICES_SAVE) {
updateSaveFileNameExtension();
}
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
uno::Any SAL_CALL SalAquaFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction )
throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
uno::Any aValue = m_pControlHelper->getValue(nControlId, nControlAction);
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
return aValue;
}
void SAL_CALL SalAquaFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable )
throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
m_pControlHelper->enableControl(nControlId, bEnable);
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& aLabel )
throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
SolarMutexGuard aGuard;
NSString* sLabel = [NSString stringWithOUString:aLabel];
m_pControlHelper->setLabel( nControlId, sLabel ) ;
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
rtl::OUString SAL_CALL SalAquaFilePicker::getLabel( sal_Int16 nControlId )
throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
return m_pControlHelper->getLabel(nControlId);
}
@@ -523,8 +446,6 @@ throw( uno::RuntimeException )
void SAL_CALL SalAquaFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments )
throw( uno::Exception, uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "arguments size", aArguments.getLength());
-
SolarMutexGuard aGuard;
// parameter checking
@@ -598,8 +519,6 @@ throw( uno::Exception, uno::RuntimeException )
m_pControlHelper->initialize(templateId);
implInitialize();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
#pragma mark XCancellable
@@ -609,15 +528,11 @@ throw( uno::Exception, uno::RuntimeException )
void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
SolarMutexGuard aGuard;
if (m_pDialog != nil) {
[m_pDialog cancel:nil];
}
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
#pragma mark XEventListener
@@ -627,16 +542,12 @@ void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException )
void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
SolarMutexGuard aGuard;
uno::Reference<XFilePickerListener> xFilePickerListener( aEvent.Source, css::uno::UNO_QUERY );
if( xFilePickerListener.is() )
removeFilePickerListener( xFilePickerListener );
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
#pragma mark XServiceInfo
@@ -647,12 +558,8 @@ void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) th
rtl::OUString SAL_CALL SalAquaFilePicker::getImplementationName()
throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
rtl::OUString retVal( FILE_PICKER_IMPL_NAME );
- DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
-
return retVal;
}
@@ -665,9 +572,6 @@ throw( uno::RuntimeException )
uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceNames()
throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
return FilePicker_getSupportedServiceNames();
}
@@ -707,9 +611,8 @@ void SAL_CALL SalAquaFilePicker::dialogSizeChanged()
// Misc
-void SalAquaFilePicker::ensureFilterHelper() {
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
+void SalAquaFilePicker::ensureFilterHelper()
+{
SolarMutexGuard aGuard;
if (nullptr == m_pFilterHelper) {
@@ -717,31 +620,21 @@ void SalAquaFilePicker::ensureFilterHelper() {
m_pControlHelper->setFilterHelper(m_pFilterHelper);
[m_pDelegate setFilterHelper:m_pFilterHelper];
}
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
void SalAquaFilePicker::implInitialize()
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
//call super
SalAquaPicker::implInitialize();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
-void SalAquaFilePicker::updateFilterUI() {
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
+void SalAquaFilePicker::updateFilterUI()
+{
m_pControlHelper->updateFilterUI();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
-void SalAquaFilePicker::updateSaveFileNameExtension() {
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
+void SalAquaFilePicker::updateSaveFileNameExtension()
+{
if (m_nDialogType != NAVIGATIONSERVICES_SAVE) {
return;
}
@@ -770,13 +663,10 @@ void SalAquaFilePicker::updateSaveFileNameExtension() {
OSL_TRACE("disallowing other file types");
[m_pDialog setAllowsOtherFileTypes:NO];
}
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
-void SalAquaFilePicker::filterControlChanged() {
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
+void SalAquaFilePicker::filterControlChanged()
+{
if (m_pDialog == nil) {
return;
}
@@ -790,8 +680,6 @@ void SalAquaFilePicker::filterControlChanged() {
FilePickerEvent evt;
evt.ElementId = LISTBOX_FILTER;
controlStateChanged( evt );
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index b6a2cb5..ef5246c 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/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: */
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index fde40b1..f97795a 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/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: */
More information about the Libreoffice-commits
mailing list