diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2018-07-17 10:06:27 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-08-10 01:20:43 -0700 |
| commit | 3ffca217ac7f66eddf3f88444d33241a635e60f3 (patch) | |
| tree | 6795cfdc16183bb91656399db787c5aeafa41729 /sd | |
| parent | 0e94d8392fa18d7e99224c17d3b0186187cdfe3c (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>
(cherry picked from commit 076cb54472d5bba8916df9ee50074ac74433d694)
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 ce6533bf95dc..ca9072d6ff34 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); |