diff options
| -rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/config/optcomp.cxx | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index d0266ef31c28..e164da851430 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1450,7 +1450,8 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC // finally, treat the non-default cases // introduce boolean, that indicates a document, written by version prior SO8. - const bool bDocumentPriorSO8 = !bConsiderWrapOnObjPos; + // If user settings are not loaded, we can't know if this is an old document. Better to assume no? + const bool bDocumentPriorSO8 = !bConsiderWrapOnObjPos && bAreUserSettingsFromDocument; // Use old behaviour if this setting didn't exist, but only if this setting is being read from the document. // (Obviously the setting doesn't exist if we are explicitly ignoring it, so then stick with program/user defaults) diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index a3c3837006ce..2cb5a8558eb3 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -208,7 +208,6 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) const Sequence< Sequence< PropertyValue > > aList = m_aConfigItem.GetList(); SvtCompatibilityEntry aEntry; - aEntry.setValue<bool>( SvtCompatibilityEntry::Index::ExpandWordSpace, false ); for ( const Sequence< PropertyValue >& rEntry : aList ) { |