diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-12-15 22:01:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-12-15 22:21:56 +0100 |
| commit | 5152c52de76bc650cceb6fcf2fce060b3e765f86 (patch) | |
| tree | d3642ca4b720c19ef35c6c0d295a4ef8739835af /sw/source/core/txtnode | |
| parent | d1f4dc626cab09c8ab7e37f6f7b695267bef78c2 (diff) | |
fdo#74981: sw: fix input field handling when splitting paragraphs
The SwInputFld is copied because it doesn't have HasDummyChar() set
although it has 2 dummy characters; TODO why is that...
Change-Id: Iee91c1d0cf7a7a928e7383c1839f8192e8d4d5b0
(cherry picked from commit a1718045bd6218e07caebda7c4cacdcb853eabd3)
Diffstat (limited to 'sw/source/core/txtnode')
| -rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 5e0fd19f0ee9..db941ba62fc4 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1575,11 +1575,12 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const sal_Int32 nTxtStartIdx, const sal_Int32 *const pEndIdx = pHt->GetEnd(); if ( pEndIdx && !pHt->HasDummyChar() ) { - if ( ( *pEndIdx > nTxtStartIdx - || ( *pEndIdx == nTxtStartIdx - && nAttrStartIdx == nTxtStartIdx ) ) ) + sal_uInt16 const nWhich = pHt->Which(); + if (RES_TXTATR_INPUTFIELD != nWhich // fdo#74981 skip fields + && ( *pEndIdx > nTxtStartIdx + || (*pEndIdx == nTxtStartIdx + && nAttrStartIdx == nTxtStartIdx))) { - sal_uInt16 const nWhich = pHt->Which(); if ( RES_TXTATR_REFMARK != nWhich ) { // attribute in the area => copy |