[Libreoffice-commits] core.git: sw/source

[Justin Luth (via logerrit)]

 sw/source/filter/xml/xmlimp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e72a6a73cbcb91d6125170efd422fe0b8760e377
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Thu Dec 31 23:06:56 2020 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Fri Jan 15 16:26:16 2021 +0100

    tdf#138544 sw LoadUserSettings: default ConsiderTextWrapOnObjPos
    
    This is the fifth and final patch in the series.
    When you start a new document, Writer compat setting
    "Consider wrapping style when positioning objects" is off.
    Now, when saving and reloading it with LoadUserSettings disabled,
    it is still the program default of "off", instead of "on".
    
    Change-Id: I3e3b4cb6c48dad35b258a898990d7fadfd3048db
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108549
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 1e8691ca827b..cd5f2b18f115 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1498,7 +1498,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
         xProps->setPropertyValue( "UseFormerTextWrapping", makeAny( true ) );
     }
 
-    if( !bConsiderWrapOnObjPos )
+    if (!bConsiderWrapOnObjPos && bAreUserSettingsFromDocument)
     {
         xProps->setPropertyValue( "ConsiderTextWrapOnObjPos", makeAny( false ) );
     }