From e0b112e2415fa9c92f786625e6aec9e5048a69b6 Mon Sep 17 00:00:00 2001 From: maho Date: Mon, 15 Mar 2004 12:49:46 +0000 Subject: Modified so that correctly apply --- editors/openoffice-1.1-devel/files/patch-topsection | 2 +- editors/openoffice-1.1/files/patch-topsection | 2 +- editors/openoffice.org-1.1-devel/files/patch-topsection | 2 +- editors/openoffice.org-1.1/files/patch-topsection | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'editors') diff --git a/editors/openoffice-1.1-devel/files/patch-topsection b/editors/openoffice-1.1-devel/files/patch-topsection index a332718..0fd6684 100644 --- a/editors/openoffice-1.1-devel/files/patch-topsection +++ b/editors/openoffice-1.1-devel/files/patch-topsection @@ -4,7 +4,7 @@ bool bStartAttr = pPlcxMan->Get(&aRes); // hole Attribut-Pos aRes.nAktCp = rTxtPos; // Akt. Cp-Pos -- if (aRes.nFlags & MAN_MASK_NEW_SEP) // neue Section +- if ((aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText) // neue Section + if ((aRes.nFlags & MAN_MASK_NEW_SEP) || maSectionManager.empty()) // neue Section { ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode"); diff --git a/editors/openoffice-1.1/files/patch-topsection b/editors/openoffice-1.1/files/patch-topsection index a332718..0fd6684 100644 --- a/editors/openoffice-1.1/files/patch-topsection +++ b/editors/openoffice-1.1/files/patch-topsection @@ -4,7 +4,7 @@ bool bStartAttr = pPlcxMan->Get(&aRes); // hole Attribut-Pos aRes.nAktCp = rTxtPos; // Akt. Cp-Pos -- if (aRes.nFlags & MAN_MASK_NEW_SEP) // neue Section +- if ((aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText) // neue Section + if ((aRes.nFlags & MAN_MASK_NEW_SEP) || maSectionManager.empty()) // neue Section { ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode"); diff --git a/editors/openoffice.org-1.1-devel/files/patch-topsection b/editors/openoffice.org-1.1-devel/files/patch-topsection index a332718..0fd6684 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-topsection +++ b/editors/openoffice.org-1.1-devel/files/patch-topsection @@ -4,7 +4,7 @@ bool bStartAttr = pPlcxMan->Get(&aRes); // hole Attribut-Pos aRes.nAktCp = rTxtPos; // Akt. Cp-Pos -- if (aRes.nFlags & MAN_MASK_NEW_SEP) // neue Section +- if ((aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText) // neue Section + if ((aRes.nFlags & MAN_MASK_NEW_SEP) || maSectionManager.empty()) // neue Section { ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode"); diff --git a/editors/openoffice.org-1.1/files/patch-topsection b/editors/openoffice.org-1.1/files/patch-topsection index a332718..0fd6684 100644 --- a/editors/openoffice.org-1.1/files/patch-topsection +++ b/editors/openoffice.org-1.1/files/patch-topsection @@ -4,7 +4,7 @@ bool bStartAttr = pPlcxMan->Get(&aRes); // hole Attribut-Pos aRes.nAktCp = rTxtPos; // Akt. Cp-Pos -- if (aRes.nFlags & MAN_MASK_NEW_SEP) // neue Section +- if ((aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText) // neue Section + if ((aRes.nFlags & MAN_MASK_NEW_SEP) || maSectionManager.empty()) // neue Section { ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode"); -- cgit v1.1