diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-03-20 13:19:32 +0100 |
|---|---|---|
| committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-03-20 14:58:01 +0000 |
| commit | 326be48e3e3edd151e59abbafac6c70077296675 (patch) | |
| tree | 5948528e7b5aaff737f3ff2b1a9139a9e8836acd | |
| parent | 96b079e24f86f7f49a624573783c6e103012f942 (diff) | |
fdo#55814 SwDoc::UpdateExpFlds: hiding the last section may be safe
In case we know there is a non-section paragraph at the end of the
document. Intentionally not adding a unit test as David Ostrovsky is
working on one already.
(cherry picked from commit 62344016de056965a58ea2016d912a68eac0d6b0)
Change-Id: Ia6026846981b5af014246a8a604c5f762d34c891
Reviewed-on: https://gerrit.libreoffice.org/2876
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
| -rw-r--r-- | sw/source/core/doc/docfld.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index c2d1dbc063e5..e99954b1dba8 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -1304,10 +1304,16 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds ) // This section will be hidden, but it wasn't before if (nShownSections == 1) { - // This would be the last section, so set its condition to false, and avoid hiding it. - OUString aCond("0"); - pSect->SetCondition(aCond); - bHide = false; + // Is the last node part of a section? + SwPaM aPam(GetNodes()); + aPam.Move(fnMoveForward, fnGoDoc); + if (aPam.Start()->nNode.GetNode().StartOfSectionNode()->IsSectionNode()) + { + // This would be the last section, so set its condition to false, and avoid hiding it. + OUString aCond("0"); + pSect->SetCondition(aCond); + bHide = false; + } } nShownSections--; } |