diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-01-08 14:20:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-09 16:21:44 +0000 |
| commit | 6af2caab7271e11d9501fd6a597e05194d33fd10 (patch) | |
| tree | 1a0415067ba8ca0b69a6214aaa3b27a06bb5da75 /xmloff | |
| parent | 57ded88656b548063cc000628920a601f0c708f6 (diff) | |
Resolves: #i123792# correction for comments/annotations on table cell ranges
(cherry picked from commit c25523dd3a302d1bd36297a817a869afb3605d1f)
Conflicts:
sw/inc/IDocumentMarkAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/docbm.cxx
sw/source/core/undo/undobj.cxx
sw/source/ui/shells/textfld.cxx
xmloff/source/text/txtfldi.cxx
Change-Id: Ic2e12f47e7775ee16f31bedf89d5644b18734d7a
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtfldi.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index b555e722fb5c..d5e1b8ea0c75 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3730,8 +3730,8 @@ void XMLAnnotationImportContext::EndElement() // let's create a text range covering the old and the current position. uno::Reference<text::XText> xText = GetImportHelper().GetText(); uno::Reference<text::XTextCursor> xCursor = - xText->createTextCursorByRange(xPrevField->getAnchor()); - xCursor->gotoRange(GetImportHelper().GetCursorAsRange(), true); + xText->createTextCursorByRange(GetImportHelper().GetCursorAsRange()); + xCursor->gotoRange(xPrevField->getAnchor(), true); uno::Reference<text::XTextRange> xTextRange(xCursor, uno::UNO_QUERY); xText->insertTextContent(xTextRange, xPrevField, !xCursor->isCollapsed()); |