Author: rgheck
Date: Sat Nov 19 17:22:21 2011
New Revision: 40219
URL: http://www.lyx.org/trac/changeset/40219
Log:
Fixes for bug #7870 from Helge.
Added:
lyx-devel/branches/BRANCH_2_0_X/lib/examples/sheet1.gnumeric
lyx-devel/branches/BRANCH_2_0_X/lib/examples/sheet2.ods
lyx-devel/branches/BRANCH_2_0_X/lib/examples/sheet3.xls
Modified:
lyx-devel/branches/BRANCH_2_0_X/lib/Makefile.am
lyx-devel/branches/BRANCH_2_0_X/lib/examples/longsheet.gnumeric
lyx-devel/branches/BRANCH_2_0_X/lib/examples/spreadsheet.lyx
lyx-devel/branches/BRANCH_2_0_X/lib/external_templates
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/lib/Makefile.am
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/lib/Makefile.am Sat Nov 19 06:44:20
2011 (r40218)
+++ lyx-devel/branches/BRANCH_2_0_X/lib/Makefile.am Sat Nov 19 17:22:21
2011 (r40219)
@@ -273,9 +273,9 @@
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 \
Modified: lyx-devel/branches/BRANCH_2_0_X/lib/examples/longsheet.gnumeric
==============================================================================
Binary file (source and/or target). No diff available.
Added: lyx-devel/branches/BRANCH_2_0_X/lib/examples/sheet1.gnumeric
==============================================================================
Binary files /dev/null 00:00:00 1970 (empty, because file is newly added)
and lyx-devel/branches/BRANCH_2_0_X/lib/examples/sheet1.gnumeric Sat Nov 19
17:22:21 2011 (r40219) differ
Added: lyx-devel/branches/BRANCH_2_0_X/lib/examples/sheet2.ods
==============================================================================
Binary files /dev/null 00:00:00 1970 (empty, because file is newly added)
and lyx-devel/branches/BRANCH_2_0_X/lib/examples/sheet2.ods Sat Nov 19
17:22:21 2011 (r40219) differ
Added: lyx-devel/branches/BRANCH_2_0_X/lib/examples/sheet3.xls
==============================================================================
Binary files /dev/null 00:00:00 1970 (empty, because file is newly added)
and lyx-devel/branches/BRANCH_2_0_X/lib/examples/sheet3.xls Sat Nov 19
17:22:21 2011 (r40219) differ
Modified: lyx-devel/branches/BRANCH_2_0_X/lib/examples/spreadsheet.lyx
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/lib/examples/spreadsheet.lyx Sat Nov
19 06:44:20 2011 (r40218)
+++ lyx-devel/branches/BRANCH_2_0_X/lib/examples/spreadsheet.lyx Sat Nov
19 17:22:21 2011 (r40219)
@@ -127,7 +127,7 @@
\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 @@
\begin_layout Standard
\begin_inset External
template GnumericSpreadsheet
- filename sheet.gnumeric
+ filename sheet1.gnumeric
\end_inset
@@ -145,7 +145,7 @@
\begin_layout Standard
Then
\emph on
-sheet.ods,
+sheet2.ods,
\emph default
which was made with OpenOffice.org:
\end_layout
@@ -153,7 +153,7 @@
\begin_layout Standard
\begin_inset External
template GnumericSpreadsheet
- filename sheet.ods
+ filename sheet2.ods
\end_inset
@@ -163,15 +163,15 @@
\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
Modified: lyx-devel/branches/BRANCH_2_0_X/lib/external_templates
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/lib/external_templates Sat Nov 19
06:44:20 2011 (r40218)
+++ lyx-devel/branches/BRANCH_2_0_X/lib/external_templates Sat Nov 19
17:22:21 2011 (r40219)
@@ -69,7 +69,7 @@
Requirement "multirow"
Requirement "hhline"
Requirement "ifthen"
- ReferencedFile latex "$$AbsOrRelPathMaster$$Basename.tex"
+ ReferencedFile pdflatex "$$AbsOrRelPathMaster$$Basename.tex"
FormatEnd
TemplateEnd
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Sat Nov 19 06:44:20 2011
(r40218)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Sat Nov 19 17:22:21 2011
(r40219)
@@ -161,6 +161,8 @@
- Escape ampersands in <title> when outputting XHTML.
+- Fix export of spreadsheets (bug 7897).
+
* TEX2LYX
