Account for old versions of Pygments

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

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index e510054328c873738418aaf9d6ed3478325306e8..627ec4c4c95c31be9ff7c4694c7a3266488c1fab 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -1592,14 +1592,14 @@ void MenuDefinition::expandCiteStyles(BufferView const * bv)
        ci.isQualified = qualified;
        ci.pretexts = pres;
        ci.posttexts = posts;
-       vector<docstring> citeStrings =
+       BiblioInfo::CiteStringMap citeStrings =
                buf->masterBibInfo().getCiteStrings(keys, citeStyleList, bv->buffer(), ci);
 
-       vector<docstring>::const_iterator cit = citeStrings.begin();
-       vector<docstring>::const_iterator end = citeStrings.end();
+       BiblioInfo::CiteStringMap::const_iterator cit = citeStrings.begin();
+       BiblioInfo::CiteStringMap::const_iterator end = citeStrings.end();
 
        for (int ii = 1; cit != end; ++cit, ++ii) {
-               docstring label = *cit;
+               docstring label = cit->second;
                CitationStyle cs = citeStyleList[ii - 1];
                cs.forceUpperCase &= force;
                cs.hasStarredVersion &= star;
@@ -2192,7 +2192,7 @@ void Menus::Impl::expand(MenuDefinition const & frommenu,
                        if (!buf)
                                break;
                        string const format = buf->params().getDefaultOutputFormat();
-                       Format const * f = formats.getFormat(format);
+                       Format const * f = theFormats().getFormat(format);
                        docstring const name = f ? f->prettyname() : from_utf8(format);
                        docstring const label = bformat(_("Export [%1$s]|E"), name);
                        MenuItem item(MenuItem::Command, toqstr(label),