summaryrefslogtreecommitdiff
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
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 (*.*)").
-rw-r--r--avmedia/source/viewer/mediawindow.src2
-rw-r--r--cui/source/options/optinet2.src2
-rw-r--r--fpicker/source/office/iodlg.src2
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx3
-rw-r--r--odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba4
-rw-r--r--sd/source/ui/app/strings.src2
-rw-r--r--sfx2/source/appl/app.src2
-rw-r--r--starmath/source/smres.src2
-rw-r--r--sw/source/ui/dbui/dbui.src2
9 files changed, 12 insertions, 9 deletions
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
index 1c92b4d913af..5a6535fb1bce 100644
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.src
@@ -50,7 +50,7 @@ String AVMEDIA_STR_ALL_MEDIAFILES
String AVMEDIA_STR_ALL_FILES
{
- Text[en-US] = "All files (*.*)";
+ Text[en-US] = "All files";
};
// ------------------------------------------------------------------------------
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 34789e70aa2a..9ac8dc15a9af 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -473,7 +473,7 @@ TabPage RID_SVXPAGE_INET_MAIL
String STR_DEFAULT_FILENAME
{
- Text [ en-US ] = "All files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
};
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));
}
diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba
index 4a36d76217e2..67cd8252d1c7 100644
--- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba
+++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba
@@ -38,10 +38,10 @@ Sub OpenFileDialog()
oFilePicker = CreateUnoService( &quot;com.sun.star.ui.dialogs.FilePicker&quot; )
REM set filter
- oFilePicker.AppendFilter( &quot;All files (*.*)&quot;, &quot;*.*&quot; )
+ oFilePicker.AppendFilter( &quot;All files&quot;, &quot;*.*&quot; )
oFilePicker.AppendFilter( &quot;StarOffice 6.0 Text Text Document&quot;, &quot;*.sxw&quot; )
oFilePicker.AppendFilter( &quot;StarOffice 6.0 Spreadsheet&quot;, &quot;*.sxc&quot; )
- oFilePicker.SetCurrentFilter( &quot;All files (*.*)&quot; )
+ oFilePicker.SetCurrentFilter( &quot;All files&quot; )
REM if no file URL is set, get path settings from configuration
oTextFieldModel = oDialog.Model.TextField1
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 3b6b2e4d5670..1bc40bfc72a3 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -397,7 +397,7 @@ String STR_SD_PAGE
};
String STR_ALL_FILES
{
- Text [ en-US ] = "All files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
String STR_UNDO_INSERT_TEXTFRAME
{
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index f11578805e4d..f52b6daa565e 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -466,7 +466,7 @@ String RID_SVXSTR_GRAFIKLINK
};
String STR_SFX_FILTERNAME_ALL
{
- Text [ en-US ] = "All files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
String RID_SVXSTR_EDITGRFLINK
{
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index dd616848f277..e565bfae42c5 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -1554,7 +1554,7 @@ String RID_SYMBOLFILESSTR
String RID_ALLFILESSTR
{
- Text [ en-US ] = "All Files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
String RID_ERR_IDENT
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 3286d212b97e..db41b95c8c85 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -159,7 +159,7 @@ String STR_NOTASSIGNED
};
String STR_FILTER_ALL
{
- Text [ en-US ] = "All files (*.*)" ;
+ Text [ en-US ] = "All files" ;
};
String STR_FILTER_ALL_DATA
{