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

Justin Luth (via logerrit) logerrit at kemper.freedesktop.org
Wed Jun 9 18:31:23 UTC 2021


 sw/source/filter/ww8/ww8par.cxx             |    1 -
 writerfilter/source/filter/WriterFilter.cxx |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit aa39400c73fac4b0430ee47a0d18bf4978f7f2d0
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Fri Jun 4 15:22:33 2021 +0200
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Wed Jun 9 20:29:40 2021 +0200

    NFC compat cleanup: no need to specify default TabOverflow
    
    This really confused me because it lead me to think
    that this was something done for MS compatibility.
    
    Well, that is only true in an off-handed way.
    LibreOffice itself was changed to work similarly
    to MS Word. So there is nothing special about how DOC
    or DOCX/RTF are handled.
    
    Since the compat settings are not saved or loaded
    into MS Formats (i.e. it just takes the default value),
    and since on an ODT save it also will just save
    with the proper default value, there is no need
    to specify "TabOverflow = true" in non-ODT import filters.
    
    Only ooxmlexport16 has a unit test that reacts if
    tabOverflow is false. That one is mine and it indicates
    that the document would be better if tabOverflow was off,
    so there are no examples of how tabOverflow improves a doc.
    
    Change-Id: I97c25154108bc1ca0fcd3dfcff66fea0ea2bca7e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116741
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index a4ce6ada24dd..7f5b8d543875 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1916,7 +1916,6 @@ void SwWW8ImplReader::ImportDop()
 
     m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::INVERT_BORDER_SPACING, true);
     m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::COLLAPSE_EMPTY_CELL_PARA, true);
-    m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TAB_OVERFLOW, true);
     m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::UNBREAKABLE_NUMBERINGS, true);
     m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::CLIPPED_PICTURES, true);
     m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TAB_OVER_MARGIN, true);
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index f1a57253b125..2d20ab1ef0c3 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -318,7 +318,6 @@ void WriterFilter::setTargetDocument(const uno::Reference<lang::XComponent>& xDo
     xSettings->setPropertyValue("IgnoreTabsAndBlanksForLineCalculation", uno::makeAny(true));
     xSettings->setPropertyValue("InvertBorderSpacing", uno::makeAny(true));
     xSettings->setPropertyValue("CollapseEmptyCellPara", uno::makeAny(true));
-    xSettings->setPropertyValue("TabOverflow", uno::makeAny(true));
     // tdf#142404 TabOverSpacing (new for compatibilityMode15/Word2013+) is a subset of TabOverMargin
     // (which applied to DOCX <= compatibilityMode14).
     // TabOverMargin looks at tabs beyond the normal text area,


More information about the Libreoffice-commits mailing list