Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2901

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/2901/1

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
---
M sw/source/core/doc/docfld.cxx
1 file changed, 10 insertions(+), 4 deletions(-)



diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index a2a58fc..69e13dc 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1325,10 +1325,16 @@
                     // 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--;
                 }

-- 
To view, visit https://gerrit.libreoffice.org/2901
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6026846981b5af014246a8a604c5f762d34c891
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Miklos Vajna <vmiklos@suse.cz>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.