tex2lyx Preamble.cpp, text.cpp: fix #7845 also for spreadsheet template

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40424 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index f3f4b5c98812b95e74bbdf61950c7eabcf54df6b..604dd59451d57778dd55584633890f32b2533496 100644 (file)
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -731,11 +731,12 @@ void Preamble::handle_package(Parser &p, string const & name,
                        options.clear();
        }
 
-       else if (name == "array" || name == "booktabs" || name == "float" ||
-                name == "color" || name == "hhline" || name == "longtable" ||
-                name == "makeidx" || name == "nomencl" || name == "splitidx" ||
-                name == "setspace" || name == "subscript" || name == "ulem" ||
-                name == "url") {
+       else if (name == "array" || name == "booktabs" || name == "calc" ||
+                    name == "color" || name == "hhline" || name == "ifthen" ||
+                    name == "float" || name == "longtable" || name == "makeidx" ||
+                    name == "multirow" || name == "nomencl" || name == "setspace" ||
+                    name == "splitidx" || name == "subscript" || name == "ulem" ||
+                    name == "url") {
                if (!in_lyx_preamble)
                        h_preamble << package_beg_sep << name
                                   << package_mid_sep << "\\usepackage{"

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 977621d6fceb5f080711cf16b1c26ae571cf1987..1cdc27e7413c89a6e41e91e836676b51194da7c5 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2365,6 +2365,16 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                                end_inset(os);
                                                context.check_layout(os);
                                                macro = false;
+                                               // register the packages that are automatically reloaded
+                                               // by the Gnumeric template
+                                               // Fixme: InsetExternal.cpp should give us that list
+                                               preamble.registerAutomaticallyLoadedPackage("array");
+                                               preamble.registerAutomaticallyLoadedPackage("calc");
+                                               preamble.registerAutomaticallyLoadedPackage("color");
+                                               preamble.registerAutomaticallyLoadedPackage("hhline");
+                                               preamble.registerAutomaticallyLoadedPackage("ifthen");
+                                               preamble.registerAutomaticallyLoadedPackage("longtable");
+                                               preamble.registerAutomaticallyLoadedPackage("multirow");
                                        }
                                }
                        }