strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#97924# overwrite text: extra paragraphs should only be inserted when tables or sections are found

Browse source
This commit is contained in:
Oliver Specht 2002-05-30 13:46:23 +00:00
parent 32c82808a5
commit 7d0e863fa2
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
sw/source/core/unocore/unotext.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: unotext.cxx,v $
*
* $Revision: 1.18 $
* $Revision: 1.19 $
*
* last change: $Author: os $ $Date: 2002-03-19 08:43:51 $
* last change: $Author: os $ $Date: 2002-05-30 14:46:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -998,13 +998,33 @@ void SwXText::setString(const OUString& aString) throw( uno::RuntimeException )
//all tables and sections can be removed by the selecting XTextCursor
{
SwPosition aStartPos(*pStartNode);
GetDoc()->AppendTxtNode( aStartPos );
const SwEndNode* pEnd = pStartNode->EndOfSectionNode();
SwNodeIndex aIdx(*pEnd);
aIdx--;
SwPosition aEndPos(aIdx.GetNode());
SwPaM aPam(aEndPos);
GetDoc()->AppendTxtNode( *aPam.Start() );
SwNodeIndex aEndIdx(*pEnd);
aEndIdx--;
//the inserting of nodes should only be done if really necessary
//to prevent #97924# (removes paragraph attributes when setting the text
//e.g. of a table cell
BOOL bInsertNodes = FALSE;
SwNodeIndex aStartIdx(*pStartNode);
do
{
aStartIdx++;
SwNode& rCurrentNode = aStartIdx.GetNode();
if(rCurrentNode.GetNodeType() == ND_SECTIONNODE
||rCurrentNode.GetNodeType() == ND_TABLENODE)
{
bInsertNodes = TRUE;
break;
}
}
while(aStartIdx < aEndIdx);
if(bInsertNodes)
{
GetDoc()->AppendTxtNode( aStartPos );
SwPosition aEndPos(aEndIdx.GetNode());
SwPaM aPam(aEndPos);
GetDoc()->AppendTxtNode( *aPam.Start() );
}
}
uno::Reference< XTextCursor > xRet = createCursor();