sw/qa/extras/ooxmlimport/data/tdf85523.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 8 ++++++++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 ++-
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 10a142356a4cdb487da10d83857e4b50a0452a5b
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Jan 19 09:27:19 2016 +0100
tdf#85523 DOCX import: fix unexpected extra char at comment end
Change-Id: Ic3eb073d11a395a81b90fd1a9292d6ecf2940c09
(cherry picked from commit 39969defa29948d77565a7cd8a3471baaec8f35d)
Reviewed-on: https://gerrit.libreoffice.org/22306
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/sw/qa/extras/ooxmlimport/data/tdf85523.docx
b/sw/qa/extras/ooxmlimport/data/tdf85523.docx
new file mode 100644
index 0000000..cd31ae4
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf85523.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index a83d683..424e5f6 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2114,6 +2114,14 @@ DECLARE_OOXMLIMPORT_TEST(testAnnotationFormatting,
"annotation-formatting.docx")
CPPUNIT_ASSERT_EQUAL(awt::FontUnderline::SINGLE,
getProperty<sal_Int16>(getRun(xParagraph, 1), "CharUnderline"));
}
+DECLARE_OOXMLIMPORT_TEST(testTdf85523, "tdf85523.docx")
+{
+ auto xTextField = getProperty< uno::Reference<beans::XPropertySet>
>(getRun(getParagraph(1), 6), "TextField");
+ auto xText = getProperty< uno::Reference<text::XText> >(xTextField,
"TextRange");
+ // This was "commentX": an unexpected extra char was added at the comment
end.
+ getParagraphOfText(1, xText, "comment");
+}
+
DECLARE_OOXMLIMPORT_TEST(testDMLGroupShapeRunFonts,
"dml-groupshape-runfonts.docx")
{
// Fonts defined by w:rFonts was not imported and so the font specified by
a:fontRef was used.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 363d300..02a965a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1139,9 +1139,10 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr
pPropertyMap )
else
{
uno::Reference<text::XTextCursor> xCursor;
- if (m_bParaHadField)
+ if (m_bParaHadField && !m_bIsInComments)
{
// Workaround to make sure char props of the field are
not lost.
+ // Not relevant for editeng-based comments.
OUString sMarker("X");
xCursor = xTextAppend->getText()->createTextCursor();
if (xCursor.is())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
