[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/xml/xmlimp.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit f053400c3f8c89ae122387dc64c63d2cfba86bbb
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Mar 6 12:03:32 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Mar 12 04:15:07 2019 +0100

    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 at cib.de>
    (cherry picked from commit 8f3df3a5a1570eea4d931f737c474df8601377ec)
    Reviewed-on: https://gerrit.libreoffice.org/69037
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index d838a8adb8a6..1f4d243f6c93 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1358,7 +1358,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();
@@ -1392,7 +1391,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
     bool bTabOverMargin = false;
     bool bPropLineSpacingShrinksFirstLine = false;
     bool bSubtractFlysAnchoredAtFlys = false;
-    bool bDisableOffPagePositioning = false;
     bool bCollapseEmptyCellPara = false;
 
     const PropertyValue* currentDatabaseDataSource = nullptr;
@@ -1486,8 +1484,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;
             }
@@ -1650,9 +1646,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));