writerfilter/source/dmapper/NumberingManager.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit ac27f4e7abf5339f71d4f5f3fc09a13b25669fe4 Author: Justin Luth <[email protected]> Date: Sat Apr 21 11:35:31 2018 +0300 tdf#117137: DOCX import: don't try to set grab-bag as UNO prop This modifies commit a6f2199e9888cb75960f1d35034bd44fb45e5565 "DOCX import: don't try to set grab-gag props as UNO props" Perhaps that commit should simply be reverted, but I will trust that the commit was mostly OK and simply adjust the logic so that *InteropGrabBag is ignored as before. Doing this resolves MSO being unable to open a specific document and LO missing some numbering during LO round-tripping. Probably these are just side-effects from other locations in the code that couldn't deal with these unexpected properties. For example, the numbering.xml file is malformed, since it is missing the w14: namespace. Unfortunately, I failed in my attempt to create a minimal test document. Change-Id: Idf88cd09d96546b7f03d326afb5f6e58439bcf20 Reviewed-on: https://gerrit.libreoffice.org/53271 Tested-by: Jenkins <[email protected]> Reviewed-by: Justin Luth <[email protected]> diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 02f49c62c67e..c76c3824f70c 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -218,7 +218,7 @@ uno::Sequence< beans::PropertyValue > ListLevel::GetCharStyleProperties( ) { if (IgnoreForCharStyle(aValIter->Name)) continue; - else + else if ( aValIter->Name != "CharInteropGrabBag" && aValIter->Name != "ParaInteropGrabBag" ) rProperties.emplace_back(aValIter->Name, 0, aValIter->Value, beans::PropertyState_DIRECT_VALUE); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
