Fix reloading of local layout file (bug #11120)

[lyx.git] / src / frontends / qt4 / GuiCitation.cpp

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 4e96b74555fcfe0541cd714c24d20b4a7110c1fe..638ec7d84da8bae0750230c165d4fa973f241cd5 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -204,7 +204,8 @@ void GuiCitation::applyView()
 
 void GuiCitation::showEvent(QShowEvent * e)
 {
-       filter_->clear();
+       if (!filter_->text().isEmpty())
+               filterPressed();
        availableLV->setFocus();
        DialogView::showEvent(e);
 }
@@ -283,7 +284,10 @@ void GuiCitation::updateFormatting(CitationStyle const & currentStyle)
        bool const qualified = currentStyle.hasQualifiedList
                && (rows > 1
                    || !params_["pretextlist"].empty()
-                   || !params_["posttextlist"].empty());
+                   || !params_["posttextlist"].empty()
+                   || !getPreTexts().empty()
+                   || !getPostTexts().empty());
+
        selectedLV->horizontalHeader()->setVisible(qualified);
        selectedLV->setColumnHidden(0, !qualified);
        selectedLV->setColumnHidden(2, !qualified);