diff options
author | Justin Luth <justin.luth@collabora.com> | 2020-12-31 20:44:20 +0300 |
---|---|---|
committer | Justin Luth <justin_luth@sil.org> | 2021-01-13 18:20:18 +0100 |
commit | dd7825765f83d09d132d1e6138b27cb03564aae8 (patch) | |
tree | 1207f4dd23af9a12ed4308dda24e45bb67d10a43 /sw | |
parent | fcb6e076d9004ef907a2616d04bf9c39908e6e8a (diff) |
tdf#138544 sw LoadUserSettings: default SubtractFlysAnchoredAtFlys
This is the third patch in the series.
When you start a new document, Writer compat setting
"Tolerate white lines of PDF page backgrounds
for compatibility with old documents" is off.
Now, when saving and reloading it with LoadUserSettings disabled,
it is still the program default of "off", instead of "on".
Change-Id: I06869600f0d75c9d5457372d56e39750ff5b3dae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108547
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index e164da851430..13198a2f9cfc 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1596,7 +1596,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC if (!bPropLineSpacingShrinksFirstLine) xProps->setPropertyValue("PropLineSpacingShrinksFirstLine", makeAny(false)); - if (!bSubtractFlysAnchoredAtFlys) + if (!bSubtractFlysAnchoredAtFlys && bAreUserSettingsFromDocument) xProps->setPropertyValue("SubtractFlysAnchoredAtFlys", makeAny(true)); if (!bCollapseEmptyCellPara) |