From 278b6d21d36a0ff401fdd9ed6f964cd0dca862bf Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Thu, 8 Jun 2023 20:24:28 -0400 Subject: tdf#152046 Revert "tdf#100680 sw DOCX compatibility: fix wrap of as_char flys" This reverts 7.4 commit 41b012767feb8552b60a68c7be18d80c403304bf, The premiss of the commit is that as-char flies needed to be handled differently, and yet at the spot where it was implemented, we have no idea whether we are even dealing with an as-char fly!!! As this bug report report shows, it affects paragraphy that don't have any fly whatsoever, let alone an as-char fly. Change-Id: I2fedb2d610093933081e861a16a25de2f2716258 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152778 Tested-by: Jenkins Reviewed-by: Justin Luth --- writerfilter/source/filter/WriterFilter.cxx | 1 - 1 file changed, 1 deletion(-) (limited to 'writerfilter/source/filter') diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index 1cfb0bee5387..739db5271c91 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -329,7 +329,6 @@ void WriterFilter::setTargetDocument(const uno::Reference& xDo xSettings->setPropertyValue("PropLineSpacingShrinksFirstLine", uno::Any(true)); xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage", uno::Any(true)); xSettings->setPropertyValue("DisableOffPagePositioning", uno::Any(true)); - xSettings->setPropertyValue("WordLikeWrapForAsCharFlys", uno::Any(true)); xSettings->setPropertyValue("DropCapPunctuation", uno::Any(true)); // rely on default for HyphenateURLs=false } -- cgit