sw/source/filter/ww8/ww8par.cxx | 2 ++
sw/source/writerfilter/dmapper/DomainMapper.cxx | 3 ++-
sw/source/writerfilter/filter/WriterFilter.cxx | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 7c3ee34a8fda130fb3e426ac531cc46659efc71d
Author: Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Mon Jun 24 16:20:44 2024 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Jul 30 00:27:13 2024 +0200
tdf#161264 don't hide paragraph with empty mail merge fields
With tdf#35798 db04be037b611e296ef9f2542322c52ed82d7a2b
paragraphs containing empty mail merge fields are hidden by default
to remove empty lines in address blocks.
This is now switched off when importing Word documents.
Change-Id: I0f550ff3d29ac499446df9a04676a08d914d12f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169469
Tested-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171010
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8ea537bf4a06..b752e5c31316 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1868,6 +1868,8 @@ void SwWW8ImplReader::ImportDop()
DocumentSettingId::FRAME_AUTOWIDTH_WITH_MORE_PARA, true);
m_rDoc.getIDocumentSettingAccess().set(
DocumentSettingId::FOOTNOTE_IN_COLUMN_TO_PAGEEND, true);
+ m_rDoc.getIDocumentSettingAccess().set(
+ DocumentSettingId::EMPTY_DB_FIELD_HIDES_PARA, false);
// Import Default Tabs
tools::Long nDefTabSiz = m_xWDop->dxaTab;
diff --git a/sw/source/writerfilter/dmapper/DomainMapper.cxx
b/sw/source/writerfilter/dmapper/DomainMapper.cxx
index 08cfbf4b3656..75d4fddeaeaf 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper.cxx
@@ -148,7 +148,8 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
// Enable only for new documents, since pasting from clipboard can
influence existing doc
m_pImpl->SetDocumentSettingsProperty("NoNumberingShowFollowBy",
uno::Any(true));
//paint background frames after header/footer when anchored in body
-
m_pImpl->SetDocumentSettingsProperty("PaintHellOverHeaderFooter",uno::Any(true));
+
m_pImpl->SetDocumentSettingsProperty(u"PaintHellOverHeaderFooter"_ustr,uno::Any(true));
+
m_pImpl->SetDocumentSettingsProperty(u"EmptyDbFieldHidesPara"_ustr,uno::Any(false));
}
// Initialize RDF metadata, to be able to add statements during the import.
diff --git a/sw/source/writerfilter/filter/WriterFilter.cxx
b/sw/source/writerfilter/filter/WriterFilter.cxx
index f026a1f35e6c..c547163ba08e 100644
--- a/sw/source/writerfilter/filter/WriterFilter.cxx
+++ b/sw/source/writerfilter/filter/WriterFilter.cxx
@@ -316,6 +316,8 @@ void WriterFilter::setTargetDocument(const
uno::Reference<lang::XComponent>& xDo
xSettings->setPropertyValue(u"IgnoreTabsAndBlanksForLineCalculation"_ustr,
uno::Any(true));
xSettings->setPropertyValue(u"InvertBorderSpacing"_ustr, uno::Any(true));
xSettings->setPropertyValue(u"CollapseEmptyCellPara"_ustr, uno::Any(true));
+ xSettings->setPropertyValue(u"EmptyDbFieldHidesPara"_ustr,
uno::Any(false));
+
// tdf#142404 TabOverSpacing (new for compatibilityMode15/Word2013+) is a
subset of TabOverMargin
// (which applied to DOCX <= compatibilityMode14).
// TabOverMargin looks at tabs beyond the normal text area,
