anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Warnings.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40537 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-12-21 15:08:30 +00:00
parent c9dab05dc9
commit 66afdc5b4a
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/insets/InsetLayout.cpp
View File

@ -159,7 +159,6 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
lex.pushTable(elementTags); lex.pushTable(elementTags);
FontInfo font = inherit_font;
labelfont_ = inherit_font; labelfont_ = inherit_font;
bgcolor_ = Color_none; bgcolor_ = Color_none;
bool getout = false; bool getout = false;

6
src/insets/InsetListings.cpp
View File

@ -158,8 +158,7 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
(outer_language->encoding()->hasFixedWidth()) ? (outer_language->encoding()->hasFixedWidth()) ?
outer_language->encoding() outer_language->encoding()
: encodings.fromLyXName("iso8859-1"); : encodings.fromLyXName("iso8859-1");
pair<bool, int> const c = switchEncoding(os.os(), switchEncoding(os.os(), buffer().params(), runparams, *lstenc, true);
buffer().params(), runparams, *lstenc, true);
runparams.encoding = lstenc; runparams.encoding = lstenc;
encoding_switched = true; encoding_switched = true;
} }
@ -250,8 +249,7 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
if (encoding_switched){ if (encoding_switched){
// Switch back // Switch back
pair<bool, int> const c = switchEncoding(os.os(), switchEncoding(os.os(), buffer().params(), runparams, *save_enc, true);
buffer().params(), runparams, *save_enc, true);
runparams.encoding = save_enc; runparams.encoding = save_enc;
} }