summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fpicker/source/aqua/FilterHelper.cxx9
-rw-r--r--shell/source/unix/misc/senddoc.sh4
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}
;;