diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2018-07-17 10:06:27 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2018-07-19 14:45:24 +0200 |
| commit | 076cb54472d5bba8916df9ee50074ac74433d694 (patch) | |
| tree | 3993998c6a38441d97350b9243c46476e6f7132d /sd | |
| parent | d3ecf6070b439e902343a2a83bc9384382e41fee (diff) | |
tdf#118651 OOXML ActiveX textbox: fix multiline support
of textfield component in DOCX/PPTX by handling properties
AX_FLAGS_MULTILINE and AX_FLAGS_WORDWRAP during the import
and export. Both of them need to be enabled to get multiline
textfield in MSO, but LibreOffice has got only one multiline
property. With this fix, LibreOffice imports only really
multiline textfields as multiline, and it doesn't export
multiline textfields as single line anymore.
Change-Id: I9b567c3fcdc5d01a5838a3ec2517579f8d788954
Reviewed-on: https://gerrit.libreoffice.org/57552
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-on: https://gerrit.libreoffice.org/57619
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/activex-controls-tests.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/qa/unit/activex-controls-tests.cxx b/sd/qa/unit/activex-controls-tests.cxx index 186d9a737624..0b9d4935d15e 100644 --- a/sd/qa/unit/activex-controls-tests.cxx +++ b/sd/qa/unit/activex-controls-tests.cxx @@ -266,8 +266,9 @@ void SdActiveXControlsTest::testTextBoxProperties() xPropertySet->getPropertyValue("Enabled") >>= bEnabled; CPPUNIT_ASSERT_EQUAL(false, bEnabled); + // These textfields are not multilines in the pptx testfile xPropertySet->getPropertyValue("MultiLine") >>= bMultiLine; - CPPUNIT_ASSERT_EQUAL(true, bMultiLine); + CPPUNIT_ASSERT_EQUAL(false, bMultiLine); xPropertySet->getPropertyValue("TextColor") >>= nColor; CPPUNIT_ASSERT_EQUAL(sal_Int32(0x404040), nColor); |