https://bugs.documentfoundation.org/show_bug.cgi?id=85523
Michael Weghorn <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |bisected CC| |[email protected], | |[email protected] Whiteboard|bibisectRequest filter:docx |bibisected filter:docx --- Comment #8 from Michael Weghorn <[email protected]> --- bibisect result for the bug described in comment 7 ("7 X's rather than 6"; using the bibisect-44max repository): 4b617ae69933611ff6d2f0c4509b823aba4eb61b is the first bad commit commit 4b617ae69933611ff6d2f0c4509b823aba4eb61b Author: Matthew Francis <[email protected]> Date: Sat Mar 14 23:22:10 2015 +0800 source-hash-fc3eb493ac9e8dec35060524db4dc8ca3210631a commit fc3eb493ac9e8dec35060524db4dc8ca3210631a Author: Miklos Vajna <[email protected]> AuthorDate: Tue Jul 15 18:18:19 2014 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Jul 15 19:05:06 2014 +0200 Related: bnc#875718 DOCX import: fix missing character grab-bag on fields The problem was that in case: 1) The paragraph only had a single text portion, which was a field and char grab-bag was set on it and 2) The paragraph had a style which also set the character grab-bag then during import the field's gra-bag was set on the paragraph (as it's the only portion) and later the paragraph style overwrote this, in case that had a grab-bag, too. Work this around by ensuring that in case of portion fields (i.e. not ToC, which has its own paragraphs), there are always at least two portions in a paragraph (the second is removed later). This also fixes the fake paragraph problem at the end of the bnc#875718 testcase. (There was an empty paragraph at the end of the document, but not in the file itself.) Change-Id: Ie404bc043d46157ea6157b18c4a46395cf496118 :040000 040000 d6c048cfdb5da8bce4463a1eb0f345e6a9d2de46 37149caae29d7afcee26d0cee6be4c772520b68c M opt --- $ git bisect log # bad: [cf6ea17155fabb2a120ba07c150735591ac861d7] source-hash-3f94c9e9ddfd807b449f3bb9b232cf2041fa12d2 # good: [fc71ac001f16209654d15ef8c1c4018aa55769f5] source-hash-c15927f20d4727c3b8de68497b6949e72f9e6e9e git bisect start 'latest' 'oldest' # bad: [8cf60cc706948588e2f33a6d98b7c55d454e362a] source-hash-f340f0454627939f1830826fb5cc53a90e6c62a4 git bisect bad 8cf60cc706948588e2f33a6d98b7c55d454e362a # good: [d9885f526fc7a09cc8f9f8ee643af1b966be24bb] source-hash-d1465c64c6f64ad8dd25e40cdc69649b24b305ea git bisect good d9885f526fc7a09cc8f9f8ee643af1b966be24bb # bad: [c779cf7967f4d14c5e649a5c696b07279d550efd] source-hash-e9c5022580f14c0ca97503f8b3cc56b530fff174 git bisect bad c779cf7967f4d14c5e649a5c696b07279d550efd # good: [030e0477638f9d9110ad62f88fd4b881521e0541] source-hash-1a6e47e3fda10e6d220b67d766ec6fbdfd852b80 git bisect good 030e0477638f9d9110ad62f88fd4b881521e0541 # bad: [c9e7f255b30a0410226b2074702aeba9b49dce13] source-hash-2d5a7c36ee9ae7ff39d8415f81fb911ff822548e git bisect bad c9e7f255b30a0410226b2074702aeba9b49dce13 # bad: [d0dbfc8071785ec97868d0a98dec934d9eb81e5c] source-hash-24b6add3774f5f0807c907d5a233ba8ac11116f4 git bisect bad d0dbfc8071785ec97868d0a98dec934d9eb81e5c # bad: [42270516a592a0472a672fc7058499203b949f21] source-hash-a3b6e0da35987af441042bd444c331d78a7c69b5 git bisect bad 42270516a592a0472a672fc7058499203b949f21 # bad: [03559c28ca7da90f6ef795f10d1bcdb0cbd332f2] source-hash-6e6cbf44d80ffff6457512c142c64cf857eacfaa git bisect bad 03559c28ca7da90f6ef795f10d1bcdb0cbd332f2 # good: [6ab006a48b5360de35387b6f7a566ba8d4dcec3c] source-hash-a5d4e237049abec3b6c7d13f25d8bb0773d1df5a git bisect good 6ab006a48b5360de35387b6f7a566ba8d4dcec3c # good: [20ae1c2fbd48552dede24202ed60ee795e7827ed] source-hash-ffe7faf8950eba541606d22ce7a50483fd4c84f4 git bisect good 20ae1c2fbd48552dede24202ed60ee795e7827ed # good: [5f3dddf8b3f9855f5ee04f069acc5471b9b9af13] source-hash-94b3b4fdf1023396287894c0d985683b48f55099 git bisect good 5f3dddf8b3f9855f5ee04f069acc5471b9b9af13 # good: [402ce18f4987cdb94b17d3786c33bbb96c170de0] source-hash-b409aaa7d65151106236058d3c478bd7f87dd296 git bisect good 402ce18f4987cdb94b17d3786c33bbb96c170de0 # bad: [4b617ae69933611ff6d2f0c4509b823aba4eb61b] source-hash-fc3eb493ac9e8dec35060524db4dc8ca3210631a git bisect bad 4b617ae69933611ff6d2f0c4509b823aba4eb61b # good: [5bfdb722a363a19eb24a17b6a049b1321f8a702c] source-hash-6d3269ad94bbad8abae5703edc86d8888356bf14 git bisect good 5bfdb722a363a19eb24a17b6a049b1321f8a702c # first bad commit: [4b617ae69933611ff6d2f0c4509b823aba4eb61b] source-hash-fc3eb493ac9e8dec35060524db4dc8ca3210631a @Miklos: Could you possibly have a look at this? -- You are receiving this mail because: You are the assignee for the bug.
_______________________________________________ Libreoffice-bugs mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
