summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-01-18 21:16:55 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-01-18 21:17:51 +0100
commit80eb001e6a861c68f2915d4eebded5e36e1875f6 (patch)
tree512d0e5e9433d0b2372c123e7554240a2f2852fa /sw
parentdcd291330b95e6493e341ae40ef1afe1482fcd24 (diff)
ODT export: fix namespace of <table:covered-table-cell> inside shapes
Change-Id: If96b46bac7f8212cfb83dc8b4528986137f1eaea
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/odfexport/data/gerrit13858.odtbin0 -> 10200 bytes
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx5
-rw-r--r--sw/source/filter/xml/xmltble.cxx4
3 files changed, 7 insertions, 2 deletions
diff --git a/sw/qa/extras/odfexport/data/gerrit13858.odt b/sw/qa/extras/odfexport/data/gerrit13858.odt
new file mode 100644
index 000000000000..9b3dd37ff1e4
--- /dev/null
+++ b/sw/qa/extras/odfexport/data/gerrit13858.odt
Binary files differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 77ae4ec40365..f23c2a3d96e7 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -432,6 +432,11 @@ DECLARE_ODFEXPORT_TEST(testFdo86963, "fdo86963.odt")
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
}
+DECLARE_ODFEXPORT_TEST(testGerrit13858, "gerrit13858.odt")
+{
+ // Just make sure the output is valid.
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index de682f256edb..b1db68f5f91c 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -897,7 +897,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
const long nRowSpan = pBox->getRowSpan();
if( nRowSpan < 1 )
{
- SvXMLElementExport aElem2( *this, XML_NAMESPACE_TABLE,
+ SvXMLElementExport aElem2( *this, rTblInfo.GetPrefix(),
XML_COVERED_TABLE_CELL, true,
false );
}
@@ -930,7 +930,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
for( size_t i=nOldCol; i<nCol; ++i )
{
- SvXMLElementExport aElemExport( *this, XML_NAMESPACE_TABLE,
+ SvXMLElementExport aElemExport( *this, rTblInfo.GetPrefix(),
XML_COVERED_TABLE_CELL, true,
false );
}