From 5a617f77ee803eb65051e93f659ef66433879052 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Wed, 9 Oct 2024 17:22:07 -0400 Subject: [PATCH] tdf#156707 xmloff import: always provide ControlBorder property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The problem was that 3d textbox form controls were imported as flat. The default value for ControlBorder is 3d. Since caolan's 7.5.4 63b8e8bda29efbdde0e0bd7f7d2b18d5a9b7b135, all textboxes are initially created with a flat border instead of 3d. Since 3d is the fo:border default (and never specified), the newly created control had no override to force it to 3d. So this patch forces passing a ControlBorder property. On export, since the 3d property is the default value, ControlBorder is no even provided as something to be exported, and therefore only "solid" and "none" are ever exported as fo:border qualifiers. make CppunitTest_xmloff_style CPPUNIT_TEST_NAME=testTdf156707 Change-Id: Ib4541d5e3599dc42af6055062fd709e105bf5d14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174754 Reviewed-by: Caolán McNamara Tested-by: Jenkins Reviewed-by: Justin Luth --- .../tdf156707_text_form_control_borders.odt | Bin 0 -> 14618 bytes xmloff/qa/unit/style.cxx | 25 ++++++++++++++++++ xmloff/source/forms/controlpropertyhdl.cxx | 7 ++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 xmloff/qa/unit/data/tdf156707_text_form_control_borders.odt diff --git a/xmloff/qa/unit/data/tdf156707_text_form_control_borders.odt b/xmloff/qa/unit/data/tdf156707_text_form_control_borders.odt new file mode 100644 index 0000000000000000000000000000000000000000..680832ef347d80b97fa724ea6c0cff2dddc3389e GIT binary patch literal 14618 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 xShape = getShape(0); + uno::Reference xShapeProperties(xShape, uno::UNO_QUERY_THROW); + + sal_uInt16 nBorderStyle = 0; // 0 = none, 1 = 3d [default], 2 = flat + xShapeProperties->getPropertyValue(u"ControlBorder"_ustr) >>= nBorderStyle; + CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), nBorderStyle); + + xShape = getShape(1); + xShapeProperties.set(xShape, uno::UNO_QUERY_THROW); + xShapeProperties->getPropertyValue(u"ControlBorder"_ustr) >>= nBorderStyle; + CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), nBorderStyle); + + xShape = getShape(2); + xShapeProperties.set(xShape, uno::UNO_QUERY_THROW); + xShapeProperties->getPropertyValue(u"ControlBorder"_ustr) >>= nBorderStyle; + CPPUNIT_ASSERT_EQUAL(sal_uInt16(0), nBorderStyle); +} + CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMCGR_OldToNew) { // The file contains a shape with linear gradient fill from red #ff0000 to yellow #ffff00, diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index 162fb0cbe82b..eceb9e67aab3 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -212,8 +212,13 @@ namespace xmloff if ( SvXMLUnitConverter::convertEnum( nStyle, sToken, aBorderTypeMap ) ) { _rValue <<= nStyle; - return true; } + else + { + // The internal LO default is flat, which deviates from the import default of 3d + _rValue <<= sal_uInt16(1); + } + return true; } // try interpreting it as color value