Fixes for bug #7870 from Helge.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40219 a592a061-630c-0410-9148-cb99ea01b6c8

lib/Makefile.am

@@ -273,9 +273,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 \

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
 

lib/external_templates

@@ -69,7 +69,7 @@ Template GnumericSpreadsheet
 		Requirement "multirow"
 		Requirement "hhline"
 		Requirement "ifthen"
-		ReferencedFile latex "$$AbsOrRelPathMaster$$Basename.tex"
+		ReferencedFile pdflatex "$$AbsOrRelPathMaster$$Basename.tex"
 	FormatEnd
 TemplateEnd
 

status.20x

@@ -161,6 +161,8 @@ What's new
 
 - Escape ampersands in <title> when outputting XHTML.
 
+- Fix export of spreadsheets (bug 7897).
+
 
 * TEX2LYX