summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2021-09-16 16:53:40 +0200
committerAndras Timar <andras.timar@collabora.com>2021-09-17 13:37:04 +0200
commitd8dbd123bfa7f39489ceb15ac83142635531fd43 (patch)
treee52a2ba22edb177177dd86c345151637504d3696
parentbf96d1f23e5c12f9263643dfdab94fd1361bb098 (diff)
lok: IME: directly copy formatting for inserted text
This is a fix for online where after: lok: IME: preserve formatting when inserting at the end of paragraph https://cgit.freedesktop.org/libreoffice/core/commit/?h=distro/collabora/cp-6.4&id=bf96d1f23e5c12f9263643dfdab94fd1361bb098 text formatting is lost. Change-Id: I3d316f8f4c4d750eac7900228f9f2d99f70d99bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122199 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--sw/source/core/doc/extinput.cxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index 4795862e9e1a..9f60ec1fabcf 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -102,18 +102,17 @@ SwExtTextInput::~SwExtTextInput()
{
// we need to keep correct formatting
// ie. when we erase first, then we will lost information about format
- // so:
- // 0. initial status: xxxx | OLD
- // 1. insert new content using Doc interface at the end so we will use the same formatting
- // status: xxxx | OLD | NEW
- // 2. erase old content which is placed at "start" position and before recently inserted text
- // status: xxxx | NEW
sal_Int32 nLenghtOfOldString = nEndCnt - nSttCnt;
if( bInsText )
{
pDoc->getIDocumentContentOperations().InsertString( *this, sText );
+
+ // Copy formatting to the inserted string
+ SfxItemSet aSet(pTNd->GetDoc()->GetAttrPool(), aCharFormatSetRange);
+ pTNd->GetParaAttr( aSet, nSttCnt + nLenghtOfOldString, nEndCnt + nLenghtOfOldString );
+ pTNd->SetAttr( aSet, nSttCnt, nEndCnt );
}
pTNd->EraseText( rIdx, nLenghtOfOldString );