ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

sw filter: don't write empty OOXML docPr title/description

Browse Source 
Change-Id: I4cfeec04dc32ab4aded69f5f99046f8a1cf027a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185337
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Aron Budea
2025-05-22 05:19:45 +02:00
parent ad96ff22e9
commit 0c477a65b3
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/source/filter/ww8/docxattributeoutput.cxx
+12 -8
View File
@@ -5354,17 +5354,21 @@ static rtl::Reference<::sax_fastparser::FastAttributeList> CreateDocPrAttrList(
pAttrs->add(XML_name, rName);
if (rExport.GetFilter().getVersion() != oox::core::ECMA_376_1ST_EDITION)
{
pAttrs->add(XML_descr, rDescription);
pAttrs->add(XML_title, rTitle);
if (!rDescription.empty())
pAttrs->add(XML_descr, rDescription);
if (!rTitle.empty())
pAttrs->add(XML_title, rTitle);
}
else
{ // tdf#148952 no title attribute, merge it into descr
OUString const value(rTitle.empty()
? OUString(rDescription)
: rDescription.empty()
? OUString(rTitle)
: OUString::Concat(rTitle) + "\n" + rDescription);
pAttrs->add(XML_descr, value);
if (!rTitle.empty() || !rDescription.empty())
{
OUString const value(rTitle.empty() ? OUString(rDescription)
: rDescription.empty()
? OUString(rTitle)
: OUString::Concat(rTitle) + "\n" + rDescription);
pAttrs->add(XML_descr, value);
}
}
return pAttrs;
}