diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-05-28 17:41:17 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2021-01-07 16:32:57 +0100 |
| commit | 5461539a952b16c8ac8107a7dac0f4615e6ae74c (patch) | |
| tree | f0dc64a01bb5625d32f491bac77cdf1ffa0b11a5 /sw | |
| parent | 9fe57bf7577c4254ae3f1940d7b1c6dbb1aecbae (diff) | |
tdf#102256 sw: ODF export: oops, don't write table attributes ...
... when not writing table itself.
(regression from commit d705a860936a58e40a2894a12d02be585a06e1c1)
Change-Id: I73cbb126a5c6d12399806a20cd7f4307111a6c8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95057
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/xml/xmltble.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 3808654f237f..37399807bef0 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -1077,23 +1077,6 @@ void lcl_xmltble_ClearName_Line( SwTableLine* pLine ) void SwXMLExport::ExportTable( const SwTableNode& rTableNd ) { - const SwTable& rTable = rTableNd.GetTable(); - const SwFrameFormat *pTableFormat = rTable.GetFrameFormat(); - if( pTableFormat && !pTableFormat->GetName().isEmpty() ) - { - AddAttribute( XML_NAMESPACE_TABLE, XML_NAME, pTableFormat->GetName() ); - AddAttribute( XML_NAMESPACE_TABLE, XML_STYLE_NAME, - EncodeStyleName( pTableFormat->GetName() ) ); - } - - // table:template-name= - if (!rTable.GetTableStyleName().isEmpty()) - { - OUString sStyleName; - SwStyleNameMapper::FillProgName(rTable.GetTableStyleName(), sStyleName, SwGetPoolIdFromName::TabStyle); - AddAttribute(XML_NAMESPACE_TABLE, XML_TEMPLATE_NAME, sStyleName); - } - ::std::optional<sal_uInt16> oPrefix = XML_NAMESPACE_TABLE; if (const SwFrameFormat* pFlyFormat = rTableNd.GetFlyFormat()) { @@ -1113,6 +1096,23 @@ void SwXMLExport::ExportTable( const SwTableNode& rTableNd ) if (oPrefix) { + const SwTable& rTable = rTableNd.GetTable(); + const SwFrameFormat *pTableFormat = rTable.GetFrameFormat(); + if (pTableFormat && !pTableFormat->GetName().isEmpty()) + { + AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, pTableFormat->GetName()); + AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, + EncodeStyleName(pTableFormat->GetName())); + } + + // table:template-name= + if (!rTable.GetTableStyleName().isEmpty()) + { + OUString sStyleName; + SwStyleNameMapper::FillProgName(rTable.GetTableStyleName(), sStyleName, SwGetPoolIdFromName::TabStyle); + AddAttribute(XML_NAMESPACE_TABLE, XML_TEMPLATE_NAME, sStyleName); + } + SvXMLElementExport aElem(*this, *oPrefix, XML_TABLE, true, true); // export DDE source (if this is a DDE table) |