fix for IsPlausibleSingleWordSection checking wrong condition

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx

Change-Id: I503e5944079b6c03413caea27ef940efbd44ced5
Reviewed-on: https://gerrit.libreoffice.org/5548
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx
index 423eddba763d..263a13ebabca 100644
--- a/sw/source/filter/ww8/writerwordglue.hxx
+++ b/sw/source/filter/ww8/writerwordglue.hxx
@@ -146,6 +146,22 @@ namespace sw
             */
             bool EqualTopBottom(const HdFtDistanceGlue &rOther) const;
 
+            /** Is the top of the page the same in both objects
+                when there are headers\footers present or non-present in both objects
+
+                This test is important, because we would like to ignore cases
+                when there is a header in one object and no header in the second
+                object - because it is wrong to compare between them.
+
+                @param
+                rOther the other HdFtDistanceGlue to compare against
+
+                @return true if the main text areas top and bottom is at the
+                same location, false otherwise (assuming both objects have\don't have
+                a header\footer)
+            */
+            bool StrictEqualTopBottom(const HdFtDistanceGlue &rOther) const;
+
         };
     }
 }