diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-01-19 10:41:08 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-21 08:17:53 +0000 |
| commit | 436a003bcfc98aeb2bc8f1d6b0f552cc67e908f0 (patch) | |
| tree | 5bd0482cc87de3c694bf4b7c94561179f429031a /sdext | |
| parent | 13bb526930749a2f45592c53fedb13f9508212fc (diff) | |
Ensure irreflexivity of std::stable_sort predicate
GCC 6 libstdc++ checks for that in debug mode now
Change-Id: I879b1b5eb9b54ad19749e561c55333b0a084c699
(cherry picked from commit 72865662208e1c053c8a48b4751e234cf3a312da)
Reviewed-on: https://gerrit.libreoffice.org/21635
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 59b48eab6a89..80d5cee5bd61 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -636,6 +636,10 @@ void PDFIProcessor::endIndicator() static bool lr_tb_sort( Element* pLeft, Element* pRight ) { + // Ensure irreflexivity (which could be compromised if h or w is negative): + if (pLeft == pRight) + return false; + // first: top-bottom sorting // Note: allow for 10% overlap on text lines since text lines are usually |