summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <os@openoffice.org>2000-12-07 15:56:47 +0000
committerOliver Specht <os@openoffice.org>2000-12-07 15:56:47 +0000
commit42a85d530dabe4bdbb453494487ad4b9d32295e0 (patch)
treef3ad1236324542a6e9ba3e1ad0ac979826d88f7a
parentd6111898beafc54afab138ef58caf7c974784dce (diff)
#81461# file insert fixed
-rw-r--r--sw/source/filter/xml/xmlimp.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 9381ebc0de2e..23a346aeda29 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmlimp.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: mib $ $Date: 2000-12-06 14:25:52 $
+ * last change: $Author: os $ $Date: 2000-12-07 16:56:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -344,7 +344,8 @@ SwXMLImport::~SwXMLImport()
// Revert the first split node.
SwTxtNode* pTxtNode = pSttNdIdx->GetNode().GetTxtNode();
SwNodeIndex aNxtIdx( *pSttNdIdx );
- if( pTxtNode && pTxtNode->CanJoinNext( &aNxtIdx ))
+ if( pTxtNode && pTxtNode->CanJoinNext( &aNxtIdx ) &&
+ pSttNdIdx->GetIndex() + 1 == aNxtIdx.GetIndex() )
{
// If the PaM points to the first new node, move the PaM to the
// end of the previous node.