diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-03 23:58:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-04 12:39:27 +0000 |
| commit | dc996e36e97aaafe09c28b63cbefc68454f17d2e (patch) | |
| tree | c1f22b6c4742aca301b9e1a9869ac3d5ea408259 /vcl | |
| parent | cd797aed639d5054137ef0514803c35bbd5da29d (diff) | |
fdo#44270: vcl: GTK+ file picker: fix non-grouped filter patterns
lcl_CreateAutoMarkFileDlg calls appendFilter() with "... (*.sdi)" and the
GTK+ file picker then strips off the (*.sdi) in the string given to GTK+
and then doesn't compare result properly with its stored filters; only
filters added with appendFilterGroup() work but not appendFilter() ones.
Change-Id: I0ac9272b5606ff8b81f0c14160fc6972789bb1ea
(cherry picked from commit ff5ad7e379315faa3f4afa009d23f34c7d231d9a)
Reviewed-on: https://gerrit.libreoffice.org/7835
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index dc9c889849c7..372b8bf0c204 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -521,7 +521,8 @@ namespace { sal_Bool bMatch; if( !_rEntry.hasSubFilters() ) // a real filter - bMatch = ( _rEntry.getTitle() == rTitle ); + bMatch = (_rEntry.getTitle() == rTitle) + || (shrinkFilterName(_rEntry.getTitle()) == rTitle); else // a filter group -> search the sub filters bMatch = |