diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-topsection b/editors/openoffice-1.1-devel/files/patch-topsection index a332718508de..0fd6684166b2 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 a332718508de..0fd6684166b2 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 a332718508de..0fd6684166b2 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 a332718508de..0fd6684166b2 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"); |