summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2011-12-22 19:27:00 +0100
committerLuboš Luňák <l.lunak@suse.cz>2011-12-22 19:32:53 +0100
commit643de3b64ed4b71ab48a7f100c90c1c4d5f918cc (patch)
tree0e0709d96db67384ffc5423ae4aaed1e4e4974a7 /fpicker
parent78a7db0523f9611b003facd612411d3d61a0ab13 (diff)
"*.*" is not "all files" (bnc#738021)
Not on any Unix, at least. I have no idea how deep entrenched is this mistake all over the code, so I'll play safe and just fix the KDE4 fpicker (GNOME/KDE3 seem to handle it fine), but at least in the UI show just "All files" instead of "All files (*.*)").
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/office/iodlg.src2
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx3
2 files changed, 4 insertions, 1 deletions
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 4a3c2f6736fb..da11eb5e8bd7 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -294,7 +294,7 @@ String RID_FILEOPEN_NOTEXISTENTFILE
String STR_FILTERNAME_ALL
{
- Text [ en-US ] = "All files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
String STR_SVT_ALREADYEXISTOVERWRITE
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 4027e3c96066..f282645e2dbb 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -306,6 +306,9 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const
// openoffice gives us filters separated by ';' qt dialogs just want space separated
f.replace(";", " ");
+ // make sure "*.*" is not used as "all files"
+ f.replace("*.*", "*");
+
_filter.append(QString("%1|%2").arg(f).arg(t));
}