Kaydet (Commit) c1f393d8 authored tarafından Luke Deller's avatar Luke Deller Kaydeden (comit) Aron Budea

tdf#107035 Fix field character style DOCX import

Reinstate a call to DontExpandFormat which was removed from
appendTextContent in commit 232ad2f2

This ensures that direct character formatting which ended immediately
before the insertion point will not be expanded to cover the inserted
content.

Reviewed-on: https://gerrit.libreoffice.org/50729Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 18cbb8fe)

Change-Id: Ie5fa6b5c5acee4f885f9e67535e98801af23661a
üst 8618c80b
...@@ -527,6 +527,10 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) ...@@ -527,6 +527,10 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
aIllegal.Message = "first parameter invalid"; aIllegal.Message = "first parameter invalid";
throw aIllegal; throw aIllegal;
} }
// Any direct formatting ending at the insert position (xRange) should not
// be expanded to cover the inserted content (xContent)
GetDoc()->DontExpandFormat( *aPam.Start() );
// first test if the range is at the right position, then call // first test if the range is at the right position, then call
// xContent->attach // xContent->attach
const SwStartNode* pOwnStartNode = GetStartNode(); const SwStartNode* pOwnStartNode = GetStartNode();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment