diff options
author | Justin Luth <justin.luth@collabora.com> | 2021-03-02 07:46:47 +0200 |
---|---|---|
committer | Justin Luth <justin_luth@sil.org> | 2021-03-06 12:16:45 +0100 |
commit | 43436ef43132eb3ee6c10c0fe50971062677682a (patch) | |
tree | 5ad6b9d855cbc9155e639421aa7084be0bb702e3 /writerfilter | |
parent | 92ca16e97856a37a96977187d349e036cd7e5493 (diff) |
tdf#135774 writerfilter Char highlight: revert tdf#117137
revert my 6.1 commit ac27f4e7abf5339f71d4f5f3fc09a13b25669fe4
tdf#117137: DOCX import: don't try to set grab-bag as UNO prop
The ultimate problems in bug 117137 seem to have been fixed
elsewhere and the unit test still passes after the revert.
(Tested in Word 2016 and 2003).
Also my entire tone was one of uncertainty in the review process.
In general, the grabbags should not be ignored, as they are supposed
to just contain import information that should be exported again.
In this specific case, CharGrabBag is needed to identify that
the background was imported as shading, so that it will still
be exported as shading instead of being converted into a highlight.
If this revert causes problems, then the grabbag will need
to remove the problematic items (or keep only the essential items).
Change-Id: I368fcdfca9057426aa6352f1caa7b552d87905d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111937
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 2143f3b2f04c..ac8a9a4216eb 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -165,10 +165,9 @@ static bool IgnoreForCharStyle(std::u16string_view aStr, const bool bIsSymbol) //Names found in PropertyIds.cxx, Lines 56-396 return (aStr==u"Adjust" || aStr==u"IndentAt" || aStr==u"FirstLineIndent" || aStr==u"FirstLineOffset" || aStr==u"LeftMargin" - || aStr==u"CharInteropGrabBag" || aStr==u"ParaInteropGrabBag" || // We need font names when they are different for the bullet and for the text. // But leave symbols alone, we only want to keep the font style for letters and numbers. - (bIsSymbol && aStr==u"CharFontName") + || (bIsSymbol && aStr==u"CharFontName") ); } uno::Sequence< beans::PropertyValue > ListLevel::GetCharStyleProperties( ) |