anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup commit 50060053

Browse Source 
Fix two instances where theFormats() was used instead of a local parameter.

Fix layout test.
This commit is contained in:
Jean-Marc Lasgouttes 2017-03-14 14:26:26 +01:00
parent 7d4b8b7606
commit 7a124ab861
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Converter.cpp
View File

@ -235,8 +235,8 @@ void Converters::update(Formats const & formats)
ConverterList::iterator it = converterlist_.begin(); ConverterList::iterator it = converterlist_.begin();
ConverterList::iterator end = converterlist_.end(); ConverterList::iterator end = converterlist_.end();
for (; it != end; ++it) { for (; it != end; ++it) {
it->setFrom(theFormats().getFormat(it->from())); it->setFrom(formats.getFormat(it->from()));
it->setTo(theFormats().getFormat(it->to())); it->setTo(formats.getFormat(it->to()));
} }
} }
@ -247,8 +247,8 @@ void Converters::updateLast(Formats const & formats)
{ {
if (converterlist_.begin() != converterlist_.end()) { if (converterlist_.begin() != converterlist_.end()) {
ConverterList::iterator it = converterlist_.end() - 1; ConverterList::iterator it = converterlist_.end() - 1;
it->setFrom(theFormats().getFormat(it->from())); it->setFrom(formats.getFormat(it->from()));
it->setTo(theFormats().getFormat(it->to())); it->setTo(formats.getFormat(it->to()));
} }
} }

8
src/support/tests/dummy_functions.cpp
View File

@ -1,5 +1,6 @@
#include <config.h> #include <config.h>
#include "Format.h"
#include "support/Messages.h" #include "support/Messages.h"
using namespace std; using namespace std;
@ -33,6 +34,13 @@ namespace lyx {
return lyx_messages; return lyx_messages;
} }
// Dummy formats support (needed by Lexer)
Formats & theFormats()
{
static Formats dummy_formats;
return dummy_formats;
}
string alignmentToCSS(LyXAlignment) string alignmentToCSS(LyXAlignment)
{ {
return string(); return string();

2
src/tex2lyx/dummy_impl.cpp
View File

@ -84,7 +84,7 @@ Messages const & getGuiMessages()
// //
Formats & theFormats() Formats & theFormats()
{ {
static Formats dummy_formats; static Formats dummy_formats;
return dummy_formats; return dummy_formats;