diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-03-20 13:19:32 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-22 05:47:33 +0000 |
| commit | 75e7e130448182c15697c8dd0b8d50324db4f79f (patch) | |
| tree | fc82e832d6b3a0dfeda83dccde3acb11a5415481 | |
| parent | 88a2e6260c7e5eb9d96129c7391b9ed2ba8272ba (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)
Conflicts:
sw/source/core/doc/docfld.cxx
Change-Id: Ia6026846981b5af014246a8a604c5f762d34c891
Reviewed-on: https://gerrit.libreoffice.org/2901
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -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 a2a58fc52137..69e13dc856c4 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -1325,10 +1325,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. - rtl::OUString aCond(RTL_CONSTASCII_USTRINGPARAM("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. + rtl::OUString aCond(RTL_CONSTASCII_USTRINGPARAM("0")); + pSect->SetCondition(aCond); + bHide = false; + } } nShownSections--; } |