From dd7825765f83d09d132d1e6138b27cb03564aae8 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Thu, 31 Dec 2020 20:44:20 +0300 Subject: 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 --- sw/source/filter/xml/xmlimp.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/source/filter/xml/xmlimp.cxx') 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) -- cgit