sw/qa/extras/rtfimport/data/fdo63428.rtf | 8 ++++++++
sw/qa/extras/rtfimport/rtfimport.cxx | 15 +++++++++++++++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 +++++++++----
3 files changed, 32 insertions(+), 4 deletions(-)
New commits:
commit eb27a889d5c3f20dc6c1eecf7f588e54fa08a9f7
Author: Miklos Vajna <vmik...@suse.cz>
Date: Mon Aug 12 11:53:45 2013 +0200
fdo#63428 writerfilter: fix paste of commented text ranges
There were multiple problems here:
- xFoo->createTextCursorByRange() got a text range argument,
where the text range wasn't from the xFoo text
- it was assumed that all XText implements text::XParagraphCursor as
well, but this is not true for e.g. comment text
- commented text ranges were pasted as normal comments (once again, the
insert position wasn't passed around)
(cherry picked from commit c73b8072a1732f829d3d6ba6c1172d96d55b1c4f)
Change-Id: I9a975a08b08a7f32b1ee71e42f58736cc0dbb09d
Reviewed-on: https://gerrit.libreoffice.org/5368
Reviewed-by: Tor Lillqvist <t...@iki.fi>
Tested-by: Tor Lillqvist <t...@iki.fi>
diff --git a/sw/qa/extras/rtfimport/data/fdo63428.rtf
b/sw/qa/extras/rtfimport/data/fdo63428.rtf
new file mode 100644
index 0000000..826d4ca
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo63428.rtf
@@ -0,0 +1,8 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
+\stshfdbch0{\fonttbl\f0\fnil\fcharset0 Verdana;}
+{\colortbl;\red255\green255\blue255;}
+\paperw12240\paperh15840\margl1800\margr1800\margt1440\margb1440\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\fi360\sl288\slmult1\pardirnatural
+
+\f0\fs28 \cf0 {\*\atrfstart 1}\f0\fs28\b0\i0\ul0 hello{\*\atrfend
1}\f0\fs28\b0\i0\ul0 {\chatn{\*\annotation{\*\atnref
1}\pard\plain\f0\fs28\b0\i0\ul0
+\fs20 crash
+\fs28 }}\f0\fs28\b0 \i0 \ul0 }
\ No newline at end of file
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 0a56525..fc276f6 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -155,6 +155,7 @@ public:
void testFdo47440();
void testPoshPosv();
void testFdo53556();
+ void testFdo63428();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -294,6 +295,7 @@ void Test::run()
{"fdo47440.rtf", &Test::testFdo47440},
{"posh-posv.rtf", &Test::testPoshPosv},
{"fdo53556.rtf", &Test::testFdo53556},
+ {"hello.rtf", &Test::testFdo63428},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1417,6 +1419,19 @@ void Test::testFdo53556()
CPPUNIT_ASSERT_EQUAL(OUString("FrameShape"),
xShapeDescriptor->getShapeType());
}
+void Test::testFdo63428()
+{
+ // Pasting content that contained an annotation caused a crash.
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<text::XTextRange> xText(xTextDocument->getText(),
uno::UNO_QUERY);
+ uno::Reference<text::XTextRange> xEnd = xText->getEnd();
+ paste("fdo63428.rtf", xEnd);
+
+ // Additionally, commented range was imported as a normal comment.
+ CPPUNIT_ASSERT_EQUAL(OUString("TextFieldStart"),
getProperty<OUString>(getRun(getParagraph(1), 2), "TextPortionType"));
+ CPPUNIT_ASSERT_EQUAL(OUString("TextFieldEnd"),
getProperty<OUString>(getRun(getParagraph(1), 4), "TextPortionType"));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a1a4d66..467e587 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -306,7 +306,7 @@ void DomainMapper_Impl::RemoveLastParagraph( )
uno::Reference<lang::XComponent>
xParagraph(xEnumeration->nextElement(), uno::UNO_QUERY);
xParagraph->dispose();
}
- else
+ else if (xCursor.is())
{
xCursor->goLeft( 1, true );
// If this is a text on a shape, possibly the text has the trailing
@@ -1587,7 +1587,7 @@ void DomainMapper_Impl::PushAnnotation()
uno::Reference< text::XText > xAnnotationText;
m_xAnnotationField->getPropertyValue("TextRange") >>= xAnnotationText;
m_aTextAppendStack.push(TextAppendContext(uno::Reference<
text::XTextAppend >( xAnnotationText, uno::UNO_QUERY_THROW ),
- m_bIsNewDoc ? uno::Reference<text::XTextCursor>() :
m_xBodyText->createTextCursorByRange(xAnnotationText->getStart())));
+ m_bIsNewDoc ? uno::Reference<text::XTextCursor>() :
xAnnotationText->createTextCursorByRange(xAnnotationText->getStart())));
}
catch( const uno::Exception& )
{
@@ -3610,8 +3610,13 @@ void DomainMapper_Impl::AddAnnotationPosition(const bool
bStart)
uno::Reference<text::XTextRange> xCurrent;
if (xTextAppend.is())
{
- uno::Reference<text::XTextCursor> xCursor =
xTextAppend->createTextCursorByRange(xTextAppend->getEnd());
- xCurrent = xCursor->getStart();
+ uno::Reference<text::XTextCursor> xCursor;
+ if (m_bIsNewDoc)
+ xCursor =
xTextAppend->createTextCursorByRange(xTextAppend->getEnd());
+ else
+ xCursor = m_aTextAppendStack.top().xCursor;
+ if (xCursor.is())
+ xCurrent = xCursor->getStart();
}
// And save it, to be used by PopAnnotation() later.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
