]> git.lyx.org Git - features.git/commitdiff
Revert unintended part of r39694.
authorVincent van Ravesteijn <vfr@lyx.org>
Sat, 17 Sep 2011 11:04:55 +0000 (11:04 +0000)
committerVincent van Ravesteijn <vfr@lyx.org>
Sat, 17 Sep 2011 11:04:55 +0000 (11:04 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39695 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/GuiView.cpp

index 00334dc2a8e62bf80c23547f9d16b83608032260..2e0f37a11c066f278788a438a301bfa1ddce7671 100644 (file)
@@ -898,7 +898,7 @@ void GuiView::dropEvent(QDropEvent * event)
                        = theConverters().importableFormats();
                vector<const Format *>::const_iterator it = import_formats.begin();
                for (; it != import_formats.end(); ++it)
-                       if ((*it)->extension() == ext)
+                       if ((*it)->hasExtension(ext))
                                found_formats.push_back(*it);
 
                FuncRequest cmd;
@@ -2067,10 +2067,10 @@ void GuiView::importDocument(string const & argument)
                        toqstr(addPath(package().system_support().absFileName(), "examples")));
 
                docstring filter = formats.prettyName(format);
-               filter += " (*.";
+               filter += " (*.{";
                // FIXME UNICODE
-               filter += from_utf8(formats.extension(format));
-               filter += ')';
+               filter += from_utf8(formats.extensions(format));
+               filter += "})";
 
                FileDialog::Result result =
                        dlg.open(toqstr(initpath), fileFilters(toqstr(filter)));