From ce6e9e8817fa7c09625a3c587095bffc8a5eb598 Mon Sep 17 00:00:00 2001
From: Nils Carlson <pyssling@ludd.ltu.se>
Date: Thu, 20 Sep 2018 21:30:32 +0000
Subject: [PATCH] ODT Writer: Improve table header row style handling
This changes the way styles for cells in the header row
and normal rows are handled in ODT tables.
Previously a new (but identical) style was generated for
every table, specifying the style of the cells within the table.
After this change there are two style definitions for table cells,
one for the cells in the header row, one for all other cells.
This doesn't change the actual styles, but makes post-processing
changes to the table styles much simpler as it is no longer
necessary to introduce new styles for header rows and there are
now only two styles where there was previously one per table.
---
src/Text/Pandoc/Writers/OpenDocument.hs | 34 +++--
test/tables.opendocument | 184 ++++++++++++------------
2 files changed, 113 insertions(+), 105 deletions(-)
diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs
index d6ab73aa4..6f6f58ae6 100644
--- a/src/Text/Pandoc/Writers/OpenDocument.hs
+++ b/src/Text/Pandoc/Writers/OpenDocument.hs
@@ -403,8 +403,8 @@ blockToOpenDocument o bs
else withParagraphStyle o "Table" [Para c]
th <- if all null h
then return empty
- else colHeadsToOpenDocument o name (map fst paraHStyles) h
- tr <- mapM (tableRowToOpenDocument o name (map fst paraStyles)) r
+ else colHeadsToOpenDocument o (map fst paraHStyles) h
+ tr <- mapM (tableRowToOpenDocument o (map fst paraStyles)) r
return $ inTags True "table:table" [ ("table:name" , name)
, ("table:style-name", name)
] (vcat columns $$ th $$ vcat tr) $$ captionDoc
@@ -416,24 +416,24 @@ blockToOpenDocument o bs
return $ imageDoc $$ captionDoc
colHeadsToOpenDocument :: PandocMonad m
- => WriterOptions -> String -> [String] -> [[Block]]
+ => WriterOptions -> [String] -> [[Block]]
-> OD m Doc
-colHeadsToOpenDocument o tn ns hs =
+colHeadsToOpenDocument o ns hs =
inTagsIndented "table:table-header-rows" . inTagsIndented "table:table-row" . vcat <$>
- mapM (tableItemToOpenDocument o tn) (zip ns hs)
+ mapM (tableItemToOpenDocument o "TableHeaderRowCell") (zip ns hs)
tableRowToOpenDocument :: PandocMonad m
- => WriterOptions -> String -> [String] -> [[Block]]
+ => WriterOptions -> [String] -> [[Block]]
-> OD m Doc
-tableRowToOpenDocument o tn ns cs =
+tableRowToOpenDocument o ns cs =
inTagsIndented "table:table-row" . vcat <$>
- mapM (tableItemToOpenDocument o tn) (zip ns cs)
+ mapM (tableItemToOpenDocument o "TableRowCell") (zip ns cs)
tableItemToOpenDocument :: PandocMonad m
=> WriterOptions -> String -> (String,[Block])
-> OD m Doc
-tableItemToOpenDocument o tn (n,i) =
- let a = [ ("table:style-name" , tn ++ ".A1" )
+tableItemToOpenDocument o s (n,i) =
+ let a = [ ("table:style-name" , s )
, ("office:value-type", "string" )
]
in inTags True "table:table-cell" a <$>
@@ -584,13 +584,21 @@ tableStyle num wcs =
, ("style:family", "table-column" )] $
selfClosingTag "style:table-column-properties"
[("style:rel-column-width", printf "%d*" (floor $ w * 65535 :: Integer))]
- cellStyle = inTags True "style:style"
- [ ("style:name" , tableId ++ ".A1")
+ headerRowCellStyle = inTags True "style:style"
+ [ ("style:name" , "TableHeaderRowCell")
, ("style:family", "table-cell" )] $
selfClosingTag "style:table-cell-properties"
[ ("fo:border", "none")]
+ rowCellStyle = inTags True "style:style"
+ [ ("style:name" , "TableRowCell")
+ , ("style:family", "table-cell" )] $
+ selfClosingTag "style:table-cell-properties"
+ [ ("fo:border", "none")]
+ cellStyles = if num == 0
+ then headerRowCellStyle $$ rowCellStyle
+ else empty
columnStyles = map colStyle wcs
- in table $$ vcat columnStyles $$ cellStyle
+ in cellStyles $$ table $$ vcat columnStyles
paraStyle :: PandocMonad m => [(String,String)] -> OD m Int
paraStyle attrs = do
diff --git a/test/tables.opendocument b/test/tables.opendocument
index c331ecc43..c04afd492 100644
--- a/test/tables.opendocument
+++ b/test/tables.opendocument
@@ -6,59 +6,59 @@
<table:table-column table:style-name="Table1.D" />
<table:table-header-rows>
<table:table-row>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="P1">Right</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Heading">Left</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="P2">Center</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Heading">Default</text:p>
</table:table-cell>
</table:table-row>
</table:table-header-rows>
<table:table-row>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P3">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P4">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">12</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P3">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P4">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">123</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P3">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P4">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">1</text:p>
</table:table-cell>
</table:table-row>
@@ -73,59 +73,59 @@ caption:</text:p>
<table:table-column table:style-name="Table2.D" />
<table:table-header-rows>
<table:table-row>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="P5">Right</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Heading">Left</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="P6">Center</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Heading">Default</text:p>
</table:table-cell>
</table:table-row>
</table:table-header-rows>
<table:table-row>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P7">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P8">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">12</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P7">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P8">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">123</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P7">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P8">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table2.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">1</text:p>
</table:table-cell>
</table:table-row>
@@ -139,59 +139,59 @@ spaces:</text:p>
<table:table-column table:style-name="Table3.D" />
<table:table-header-rows>
<table:table-row>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="P9">Right</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Heading">Left</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="P10">Center</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Heading">Default</text:p>
</table:table-cell>
</table:table-row>
</table:table-header-rows>
<table:table-row>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P11">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P12">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">12</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P11">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P12">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">123</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P11">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P12">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">1</text:p>
</table:table-cell>
</table:table-row>
@@ -206,46 +206,46 @@ caption:</text:p>
<table:table-column table:style-name="Table4.D" />
<table:table-header-rows>
<table:table-row>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="P13">Centered Header</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Heading">Left Aligned</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="P14">Right Aligned</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Heading">Default aligned</text:p>
</table:table-cell>
</table:table-row>
</table:table-header-rows>
<table:table-row>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P15">First</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">row</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P16">12.0</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Example of a row that spans
multiple lines.</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P15">Second</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">row</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P16">5.0</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Here’s another one. Note the
blank line between rows.</text:p>
</table:table-cell>
@@ -262,46 +262,46 @@ caption:</text:p>
<table:table-column table:style-name="Table5.D" />
<table:table-header-rows>
<table:table-row>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="P17">Centered Header</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Heading">Left Aligned</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="P18">Right Aligned</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Heading">Default aligned</text:p>
</table:table-cell>
</table:table-row>
</table:table-header-rows>
<table:table-row>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P19">First</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">row</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P20">12.0</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Example of a row that spans
multiple lines.</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P19">Second</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">row</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P20">5.0</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table5.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Here’s another one. Note the
blank line between rows.</text:p>
</table:table-cell>
@@ -315,44 +315,44 @@ headers:</text:p>
<table:table-column table:style-name="Table6.C" />
<table:table-column table:style-name="Table6.D" />
<table:table-row>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P24">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P25">12</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P26">12</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P24">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P25">123</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P26">123</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P24">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P25">1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table6.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P26">1</text:p>
</table:table-cell>
</table:table-row>
@@ -365,31 +365,31 @@ headers:</text:p>
<table:table-column table:style-name="Table7.C" />
<table:table-column table:style-name="Table7.D" />
<table:table-row>
- <table:table-cell table:style-name="Table7.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P29">First</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table7.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">row</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table7.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P30">12.0</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table7.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Example of a row that spans
multiple lines.</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
- <table:table-cell table:style-name="Table7.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P29">Second</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table7.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">row</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table7.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="P30">5.0</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table7.A1" office:value-type="string">
+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Here’s another one. Note the
blank line between rows.</text:p>
</table:table-cell>