diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-03-06 12:03:32 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-03-10 01:20:50 +0100 |
| commit | f8c00f23660e6816dd0a15708702c986c0cb4062 (patch) | |
| tree | 9a00e9e87bafe40bb14d75415eca5434d7d8f474 | |
| parent | c1a0cd9f3272f484a15ab2d6c1d9fe727a2b27f1 (diff) | |
tdf#116195 sw: remove DisableOffPagePositioning handling from ODF import
SwXMLImport::SetConfigurationSettings() needs to handle only those
settings for which the default is different vs. old OOo/LO versions;
DisableOffPagePositioning however defaults to false, so we can just rely
on that default. The inverted bDisableOffPagePositioning check is
wrong.
(regression from fe3d5766fa3c42f6cf8d1ea47af820e0b1c1cf48)
Change-Id: I300fa597f58b586b49089bb555a00a6923862abe
Reviewed-on: https://gerrit.libreoffice.org/68801
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 8f3df3a5a1570eea4d931f737c474df8601377ec)
Reviewed-on: https://gerrit.libreoffice.org/68908
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 23d072afc300..3beaf597b17b 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1356,7 +1356,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC aExcludeWhenNotLoadingUserSettings.insert("TabOverMargin"); aExcludeWhenNotLoadingUserSettings.insert("PropLineSpacingShrinksFirstLine"); aExcludeWhenNotLoadingUserSettings.insert("SubtractFlysAnchoredAtFlys"); - aExcludeWhenNotLoadingUserSettings.insert("DisableOffPagePositioning"); sal_Int32 nCount = aConfigProps.getLength(); const PropertyValue* pValues = aConfigProps.getConstArray(); @@ -1391,7 +1390,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC bool bTabOverMarginValue = false; bool bPropLineSpacingShrinksFirstLine = false; bool bSubtractFlysAnchoredAtFlys = false; - bool bDisableOffPagePositioning = false; bool bCollapseEmptyCellPara = false; const PropertyValue* currentDatabaseDataSource = nullptr; @@ -1488,8 +1486,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC bPropLineSpacingShrinksFirstLine = true; else if (pValues->Name == "SubtractFlysAnchoredAtFlys") bSubtractFlysAnchoredAtFlys = true; - else if (pValues->Name == "DisableOffPagePositioning") - bDisableOffPagePositioning = true; else if (pValues->Name == "CollapseEmptyCellPara") bCollapseEmptyCellPara = true; } @@ -1660,9 +1656,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC if (!bSubtractFlysAnchoredAtFlys) xProps->setPropertyValue("SubtractFlysAnchoredAtFlys", makeAny(true)); - if ( bDisableOffPagePositioning ) - xProps->setPropertyValue("DisableOffPagePositioning", makeAny(true)); - if (!bCollapseEmptyCellPara) xProps->setPropertyValue("CollapseEmptyCellPara", makeAny(false)); |