From 55505edc8eca0e4ba30f192e81ff18982b8e2f95 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 18 Sep 2020 17:53:33 +0200 Subject: tdf#129685 PPTX import: fix unexpected centering of shape text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regression from commit 89f0af144c18efafe2573801641689a1432c0cae (tdf#113198 set default shape paragraph alignment.., 2019-11-19), the old bugdoc had this markup: (centered) The new bugdoc has 2 shapes with text: (aligned to left) (should be centered) "anchor" is about vertical, "anchorCtr" is about horizontal centering of text. Checking what the binary filter does, it maps horizontal centering to TextHorizontalAdjust, so fix the original bug differently, by leaving ParaAdjust alone, and tweaking TextHorizontalAdjust intead: this keeps the old bugdoc working but fixes the new one. This caused a number of "change detector" XML-based tests to fail: all of them are unchanged visually, so the XML files are adapted to the new state. The tdf#113198 fix itself was fixing a regression from tdf#104722, and that commit had no testcase, I tested that we don't regress there, manually. (cherry picked from commit 10bb02efd8afd42e633e370480104e2575546d8e) Change-Id: I81a7b3e8c76bfbce5c5569d16d5238958ac20f75 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103088 Tested-by: Jenkins Reviewed-by: Caolán McNamara Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103110 --- sd/qa/unit/data/xml/tdf109317_0.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sd/qa/unit/data/xml/tdf109317_0.xml') diff --git a/sd/qa/unit/data/xml/tdf109317_0.xml b/sd/qa/unit/data/xml/tdf109317_0.xml index f7ed3136257f..93afd2043c66 100644 --- a/sd/qa/unit/data/xml/tdf109317_0.xml +++ b/sd/qa/unit/data/xml/tdf109317_0.xml @@ -1,6 +1,6 @@ - + @@ -108,7 +108,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -326,7 +326,7 @@ - + @@ -381,7 +381,7 @@ - + -- cgit