diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2009-01-29 13:27:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2009-01-29 13:27:55 +0000 |
| commit | ee8b216a2c5285fe8cf00a0b143fe47fabcdd9da (patch) | |
| tree | 1989aee755c0654dcfcb7bcffbe7a81dc2438ece | |
| parent | 2004ce434723e3312263877e4a307019fde290b2 (diff) | |
CWS-TOOLING: integrate CWS macmiscfixes_OOO310
2009-01-26 07:58:26 +0100 fheckl r266898 : 97394 add a small memory leak fix
2009-01-24 20:56:18 +0100 ericb r266885 : #i95688# better fix suggested by rvojta
2009-01-24 17:13:37 +0100 rakeshpandit r266882 : #i98428# Fixed a missing ';'.
2009-01-24 00:25:43 +0100 ericb r266859 : #i95688# a try to fix the send active document including when the name contains space
2009-01-24 00:23:59 +0100 ericb r266858 : #i97394# fix aliases (disabled) in save dialog. Patch provided by Robert Vojta
| -rw-r--r-- | fpicker/source/aqua/FilterHelper.cxx | 9 | ||||
| -rw-r--r-- | shell/source/unix/misc/senddoc.sh | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx index a06cb8cb18..75996f2d32 100644 --- a/fpicker/source/aqua/FilterHelper.cxx +++ b/fpicker/source/aqua/FilterHelper.cxx @@ -407,6 +407,15 @@ sal_Bool FilterHelper::filenameMatchesFilter(NSString* sFilename) // OSL_TRACE(" folder"); return sal_True; } + + NSFileWrapper *wrapper = [[NSFileWrapper alloc] initWithPath:sFilename]; + MacOSBOOL bIsLink = [wrapper isSymbolicLink]; + [wrapper release]; + if (bIsLink) { +// OSL_TRACE(" symboliclink"); + return sal_True; + } + // OSL_TRACE(" file"); FilterList::iterator filter = ::std::find_if(m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch(m_aCurrentFilter)); diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh index 05409e027f..2e22b8e312 100644 --- a/shell/source/unix/misc/senddoc.sh +++ b/shell/source/unix/misc/senddoc.sh @@ -329,7 +329,8 @@ case `basename "$MAILER" | sed 's/-.*$//'` in while [ "$1" != "" ]; do case $1 in --attach) - ATTACH="${ATTACH:-}${ATTACH:+ } $2" + #i95688# fix filenames containing accented chars, whatever alien + ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" | ${URI_ENCODE}` shift ;; *) @@ -337,7 +338,6 @@ case `basename "$MAILER" | sed 's/-.*$//'` in esac shift; done - /usr/bin/open -a "${MAILER}" ${ATTACH} ;; |