Fixes for bug #7870 from Helge. Adds Gnumeric support.

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 704cb27a4c68a69ecbf8a54d8a6974f3eaf837a1..a1b7ec9b4a3bd23ac8f46b6e58080e26e6653263 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -268,9 +268,9 @@ dist_examples_DATA = \
        examples/serial_letter1.lyx \
        examples/serial_letter2.lyx \
        examples/serial_letter3.lyx \
-       examples/sheet.gnumeric \
-       examples/sheet.ods \
-       examples/sheet.xls \
+       examples/sheet1.gnumeric \
+       examples/sheet2.ods \
+       examples/sheet3.xls \
        examples/simplecv.lyx \
        examples/splash.lyx \
        examples/spreadsheet.lyx \

diff --git a/lib/examples/longsheet.gnumeric b/lib/examples/longsheet.gnumeric
index 312c781fe74597b7a939bf25d6dd82f4baf61e76..f8703dde1bbc4d181fa050178c9b666fb9c04089 100644 (file)
Binary files a/lib/examples/longsheet.gnumeric and b/lib/examples/longsheet.gnumeric differ

diff --git a/lib/examples/sheet1.gnumeric b/lib/examples/sheet1.gnumeric
new file mode 100644 (file)
index 0000000..7d3d07f
Binary files /dev/null and b/lib/examples/sheet1.gnumeric differ

diff --git a/lib/examples/sheet2.ods b/lib/examples/sheet2.ods
new file mode 100644 (file)
index 0000000..9eb9b8f
Binary files /dev/null and b/lib/examples/sheet2.ods differ

diff --git a/lib/examples/sheet3.xls b/lib/examples/sheet3.xls
new file mode 100644 (file)
index 0000000..50f3801
Binary files /dev/null and b/lib/examples/sheet3.xls differ

diff --git a/lib/examples/spreadsheet.lyx b/lib/examples/spreadsheet.lyx
index 4248339b3991364f1f0055068940cba8925652bb..72966f61ee67a2b0c9deabb2a43ec8cb0d065f8e 100644 (file)
--- a/lib/examples/spreadsheet.lyx
+++ b/lib/examples/spreadsheet.lyx
@@ -127,7 +127,7 @@ Simple examples
 \begin_layout Standard
 First, the file 
 \emph on
-sheet.gnumeric, 
+sheet1.gnumeric, 
 \emph default
 a spreadsheet created with Gnumeric:
 \end_layout
@@ -135,7 +135,7 @@ a spreadsheet created with Gnumeric:
 \begin_layout Standard
 \begin_inset External
        template GnumericSpreadsheet
-       filename sheet.gnumeric
+       filename sheet1.gnumeric
 
 \end_inset
 
@@ -145,7 +145,7 @@ a spreadsheet created with Gnumeric:
 \begin_layout Standard
 Then 
 \emph on
-sheet.ods, 
+sheet2.ods, 
 \emph default
 which was made with OpenOffice.org:
 \end_layout
@@ -153,7 +153,7 @@ which was made with OpenOffice.org:
 \begin_layout Standard
 \begin_inset External
        template GnumericSpreadsheet
-       filename sheet.ods
+       filename sheet2.ods
 
 \end_inset
 
@@ -163,15 +163,15 @@ which was made with OpenOffice.org:
 \begin_layout Standard
 Finally 
 \emph on
-sheet.xls 
+sheet3.xls 
 \emph default
-which was created with Excel.
+which was made for Excel.
 \end_layout
 
 \begin_layout Standard
 \begin_inset External
        template GnumericSpreadsheet
-       filename sheet.xls
+       filename sheet3.xls
 
 \end_inset
 

diff --git a/lib/external_templates b/lib/external_templates
index aa98a5fd51a578a3b8e0ee64e79bb181a957a259..ddcd31609d7b31f1c58ce087f1c1044b4e36c794 100644 (file)
--- a/lib/external_templates
+++ b/lib/external_templates
@@ -36,7 +36,7 @@ PreambleDefEnd
 Template GnumericSpreadsheet
        GuiName "Spreadsheet"
        HelpText
-               A spreadsheet made with gnumeric, openoffice or excel.
+               A spreadsheet made with gnumeric, libreoffice or excel.
                It imports as a long table, so any length
                is ok. Excessive width could be a problem.
                The gnumeric software is necessary for conversion,
@@ -69,7 +69,7 @@ Template GnumericSpreadsheet
                Requirement "multirow"
                Requirement "hhline"
                Requirement "ifthen"
-               ReferencedFile latex "$$AbsOrRelPathMaster$$Basename.tex"
+               ReferencedFile pdflatex "$$AbsOrRelPathMaster$$Basename.tex"
        FormatEnd
 TemplateEnd