sw/source/filter/ww8/wrtw8nds.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+)
New commits: commit 15c2e6c8c6bfdb05ca0cb4f09835828123c95b49 Author: Justin Luth <justin_l...@sil.org> Date: Thu Apr 16 13:31:39 2015 +0300 tdf#87437 exclude CR/cell break from redline deletions The marker used in Word to identify table cell division was being included in the track-changes deletion from the following cell if the deletion was the first node in the cell. This would cause the two table cells to merge into one when changes were accepted by Word. (Problem not seen in LibreOffice itself.) Change-Id: Ia98017cbba7d3a43b67764ae0fa6447b7e90ca86 Reviewed-on: https://gerrit.libreoffice.org/15340 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> Reviewed-on: https://gerrit.libreoffice.org/17142 Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index ac7d9c3..9adbbb1 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2185,13 +2185,19 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode ) sal_Int32 nAktPos = 0; sal_Int32 const nEnd = aStr.getLength(); + bool bIsEndOfCell = false; bool bIncludeEndOfParaCRInRedlineProperties = false; sal_Int32 nOpenAttrWithRange = 0; OUString aStringForImage("\001"); ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner; if ( pTextNodeInfo.get() != NULL ) + { pTextNodeInfoInner = pTextNodeInfo->getFirstInner(); + if ( pTextNodeInfoInner && pTextNodeInfoInner->isEndOfCell() ) { + bIsEndOfCell = true; + } + } do { const SwRedlineData* pRedlineData = aAttrIter.GetRunLevelRedline( nAktPos ); @@ -2394,6 +2400,11 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode ) } WriteCR( pTextNodeInfoInner ); + + if ( bIsEndOfCell ) + { + AttrOutput().OutputFKP(true); + } } } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits