diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:19:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:19:04 +0000 |
| commit | 29862476e53927eac52a9e1ba38254840831d010 (patch) | |
| tree | 823ff2cbd2a384202a1374eb75fd627289427101 /sw/source/core/docnode | |
| parent | acc017a28667fd5728432de97b62f5db24bfcbde (diff) | |
INTEGRATION: CWS sw30parajoin (1.32.28); FILE MERGED
2008/05/19 12:48:42 ama 1.32.28.1: Fix #50135#: Behavior of joining paragraphs
Diffstat (limited to 'sw/source/core/docnode')
| -rw-r--r-- | sw/source/core/docnode/nodes.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 59575d7ddd51..d379b4457e89 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: nodes.cxx,v $ - * $Revision: 1.33 $ + * $Revision: 1.34 $ * * This file is part of OpenOffice.org. * @@ -1804,6 +1804,8 @@ void SwNodes::Move( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes, //!NOSPLIT if( !bOneNd && ( bSplitNd || bSplitDestNd )) if( !bOneNd && bSplitDestNd ) { + if( !rPos.nContent.GetIndex() ) + bCopyCollFmt = TRUE; if( rNodes.IsDocNodes() ) { SwDoc* pInsDoc = pDestNd->GetDoc(); @@ -1834,6 +1836,7 @@ void SwNodes::Move( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes, pInsDoc->DoUndo( FALSE ); pSrcNd->CopyCollFmt( *pDestNd ); pInsDoc->DoUndo( bIsUndo ); + bCopyCollFmt = FALSE; } if( bOneNd ) // das wars schon |