diff options
| author | maho <maho@FreeBSD.org> | 2004-03-15 20:49:46 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2004-03-15 20:49:46 +0800 |
| commit | e0b112e2415fa9c92f786625e6aec9e5048a69b6 (patch) | |
| tree | fb4f3af39a29ca7104e3812c67be04c2944aec57 | |
| parent | c47d0b5f87d51a5c5eb2aab5e0e05c260be7f05b (diff) | |
| download | freebsd-ports-gnome-e0b112e2415fa9c92f786625e6aec9e5048a69b6.tar.gz freebsd-ports-gnome-e0b112e2415fa9c92f786625e6aec9e5048a69b6.tar.zst freebsd-ports-gnome-e0b112e2415fa9c92f786625e6aec9e5048a69b6.zip | |
Modified so that correctly apply
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"); |