sw/qa/extras/ooxmlexport/data/fdo80097.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 51 +++++++++++++++++++++++++++
sw/source/filter/ww8/docxattributeoutput.cxx | 5 ++
3 files changed, 56 insertions(+)
New commits:
commit 6bd609d8451c08504c47c86196c508a7022dd4b7
Author: Ravindra Vidhate <ravindra.vidh...@synerzip.com>
Date: Tue Jun 24 17:54:59 2014 +0530
fdo#80097 : tblBorders and tcBorders are not preserved for the table.
When we have multiple tables inside a table, the tblBorders and
tcBorders of the inside tables are not getting preserved.
The issue is m_aTableStyleConf is not clear when the LO starts
writing the properties of the inside table.
Change-Id: I30081b8a5a59614430a2279550ae7eb589cb71ec
Reviewed-on: https://gerrit.libreoffice.org/9893
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80097.docx
b/sw/qa/extras/ooxmlexport/data/fdo80097.docx
new file mode 100644
index 0000000..3f8ba9f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80097.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 35986b3..8683d56 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3615,6 +3615,57 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsb,
"fdo79969_xlsb.docx")
"/word/embeddings/oleObject1.xlsb");
}
+DECLARE_OOXMLEXPORT_TEST(testfdo80097, "fdo80097.docx")
+{
+ //fdo#76635 : Table borders are not getting preserved.
+
+ xmlDocPtr pXmlDocument = parseExport("word/document.xml");
+ if (!pXmlDocument)
+ return;
+
+ //Table Borders
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:val
= 'single']",1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:sz
= 4]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:space
= 0]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:color
= '00000A']", 1);
+
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:val
= 'single']",1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:sz
= 4]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:space
= 0]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:color
= '00000A']", 1);
+
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:val
= 'single']",1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:sz
= 4]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:space
= 0]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:color
= '00000A']", 1);
+
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:val
= 'single']",1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:sz
= 4]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:space
= 0]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:color
= '00000A']", 1);
+
+ //Table Cell Borders
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:val
= 'single']",1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:sz
= 4]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:space
= 0]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:color
= '00000A']", 1);
+
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom[@w:val
= 'single']",1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom[@w:sz
= 4]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom[@w:space
= 0]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom[@w:color
= '00000A']", 1);
+
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:insideH[@w:val
= 'single']",1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:insideH[@w:sz
= 4]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:insideH[@w:space
= 0]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:insideH[@w:color
= '00000A']", 1);
+
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:insideV[@w:val
= 'single']",1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:insideV[@w:sz
= 4]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:insideV[@w:space
= 0]", 1);
+ assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:insideV[@w:color
= '00000A']", 1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm, "fdo79969_xlsm.docx")
{
// This UT for DOCX embedded with excel work sheet.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 06230f4..3b74b5b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2942,6 +2942,11 @@ void DocxAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t
std::map<OUString, com::sun::star::uno::Any> aGrabBag =
sw::util::HasItem<SfxGrabBagItem>( pTblFmt->GetAttrSet(),
RES_FRMATR_GRABBAG )->GetGrabBag();
+ // We should clear the TableStyle map. In case of Table inside multiple
tables it contains the
+ // table border style of the previous table.
+ if (! m_aTableStyleConf.empty())
+ m_aTableStyleConf.clear();
+
// Extract properties from grab bag
std::map<OUString, com::sun::star::uno::Any>::iterator aGrabBagElement;
for( aGrabBagElement = aGrabBag.begin(); aGrabBagElement !=
aGrabBag.end(); ++aGrabBagElement )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
