New branch 'private/mst/sw_fieldmarkhide' available with the following commits: commit 0f6f4687ff6154c784cc0dea4a71ae1682f02050 Author: Michael Stahl <michael.st...@cib.de> Date: Tue Nov 3 22:07:24 2020 +0100
WIP draft Change-Id: I1e059c41ad0c82fa3d7c17ab324b87fc3b840861 commit 38cdeaf5217148eeeec1966bbd5e39cca80a31f0 Author: Michael Stahl <michael.st...@cib.de> Date: Tue Nov 3 22:06:52 2020 +0100 SwViewShell::ImplApplyViewOptions() Change-Id: Ie7b41048fe6c222272b345995fcdca4129be8ef0 commit 82b15a54b5ef27e8f966a11f0b7ca79c8071db29 Author: Michael Stahl <michael.st...@cib.de> Date: Tue Nov 3 22:11:59 2020 +0100 CheckParaRedlineMerge Change-Id: I4c6eac864da4b4bf531437e555a3994fd2670367 commit beeb4814e67b9cf936775448c2991e32bf8ca98a Author: Michael Stahl <michael.st...@cib.de> Date: Tue Nov 3 21:32:39 2020 +0100 sw: replace IsHideRedlines() with HasMergedParas() where obvious Change-Id: Id941d59feea5a3539da9006725ef376b14bc7d1c commit 2f574d97639c53b28c66dedd2b21c192c90345d0 Author: Michael Stahl <michael.st...@cib.de> Date: Tue Nov 3 21:48:02 2020 +0100 sw: add FieldmarkMode to SwRootFrame Change-Id: I366fe171fbcadad7643c54d76c3e28cc4b6b5dfa commit c6705713952caddb6c8c848839180e0707587224 Author: Michael Stahl <michael.st...@cib.de> Date: Tue Nov 3 16:40:45 2020 +0100 SwRedlineItr::CheckLine() assumption that Show means no MergedPara ... and also SwRedlineItr::Seek() Change-Id: I711ec37bd345cbf5f5f5339b8d792bcb56c425c7 commit 6b4025564c0c519f247f12d638a4ca291f89c2b5 Author: Michael Stahl <michael.st...@cib.de> Date: Mon Nov 2 15:58:57 2020 +0100 writerfilter: remove leftover comment Change-Id: Idb6dbb7ccb9a254def6029bb9ba84a3b02015d70 commit 137063e6a728744f8ee07dea27286c6174f29874 Author: Michael Stahl <michael.st...@cib.de> Date: Fri Oct 30 20:30:40 2020 +0100 sw: return SwXFieldmark in SwXFieldEnumeration * Implement text::XTextField in SwXFieldmark * That requires overriding XTextContent, just forward to SwXBookmark * Also override XServiceInfo implementation in SwXFieldmark * Add a PropertySetInfo for SwXFieldmark, which doesn't support "Hidden" or "Condition" properties of SwXBookmark * in SwXFieldmark::setFieldType(), only allow sensible new types * fix DomainMapper_Impl assumptions that if it implements XTextField it can't be a fieldmark, which caused CppunitTest_sw_ooxmlexport10 testTdf92157 to fail with a SAXException caused by some disposed SwXTextCursor Change-Id: I1ae2e9cb99ea784040874517e4d1af7e59d24405 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits