diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-28 17:52:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-18 15:54:54 +0000 |
| commit | 2f4fce056bc6025c924466aaf7635e2b385cecbb (patch) | |
| tree | 115a4a4acfa7f6cae357653a23d3be990600bd32 /sw/CppunitTest_sw_ooxmlimport.mk | |
| parent | Fix missing iterator include on MSVC 14.0 (diff) | |
| download | core-2f4fce056bc6025c924466aaf7635e2b385cecbb.tar.gz core-2f4fce056bc6025c924466aaf7635e2b385cecbb.zip | |
tdf#97371 DOCX import: fix text covered by shape
Regression from commit 358666e4204364ce915ee95372dc6f2fca545253
(tdf#90153 DOCX import: fix default sw TextFrame roundtrip, 2015-09-28),
the problem was that at the moment SwTextBoxHelper::syncProperty()
doesn't handle an AnchorType at-para -> at-char transition, so the
importer shouldn't do that for TextBoxes till sw core gets extended to
support the scenario.
(cherry picked from commit 8f1a1092d47947847e1d888b0284e8364c663d1f)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I8308bfd306672bc68984fbf019767c174130e18d
Reviewed-on: https://gerrit.libreoffice.org/22483
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/CppunitTest_sw_ooxmlimport.mk')
| -rw-r--r-- | sw/CppunitTest_sw_ooxmlimport.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index 5aae15d8a6b4..c934d09b42b3 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlimport, \ sw \ tl \ vcl \ + svxcore \ $(gb_UWINAPI) \ )) |