Do not output deleted rows columns if show changes in output is false

[lyx.git] / src / insets / InsetInclude.cpp

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 3cf3189..09d4be3
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -480,8 +480,10 @@ Buffer * InsetInclude::loadIfNeeded() const
        Buffer * child = theBufferList().getBuffer(included_file);
        if (!child) {
                // the readonly flag can/will be wrong, not anymore I think.
-               if (!included_file.exists())
+               if (!included_file.exists()) {
+                       failedtoload_ = true;
                        return 0;
+               }
 
                child = theBufferList().newBuffer(included_file.absFileName());
                if (!child)
@@ -848,8 +850,11 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                Language const * const oldLang = runparams.master_language;
                // If the master uses non-TeX fonts (XeTeX, LuaTeX),
                // the children must be encoded in plain utf8!
-               runparams.encoding = masterBuffer->params().useNonTeXFonts ?
-                       encodings.fromLyXName("utf8-plain") : oldEnc;
+               if (masterBuffer->params().useNonTeXFonts)
+                       runparams.encoding = encodings.fromLyXName("utf8-plain");
+               else if (oldEnc)
+                       runparams.encoding = oldEnc;
+               else runparams.encoding = &tmp->params().encoding();
                runparams.master_language = buffer().params().language;
                runparams.par_begin = 0;
                runparams.par_end = tmp->paragraphs().size();