diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-10-16 21:20:57 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-30 13:17:06 +0100 |
| commit | d2d4e0b7ceaa3f635fa0caf2fb549afc530ca4e2 (patch) | |
| tree | 6e52e9d6354c6a9b182f2de1cd7f26c1c8ffe68e /sd | |
| parent | 86207ca7eed9677f8ffe2d0bcfb7cf8c68b703d4 (diff) | |
sd: BestFittingCacheComparer must be irreflexive
/usr/include/c++/7/bits/stl_algo.h:4866:
Error: comparison doesn't meet irreflexive requirements, assert(!(a < a)).
... when using "Window->New Window" in Impress.
Change-Id: I885a59cf378b7020d549580c2fc1cf121c6a59bd
(cherry picked from commit d4269c5373cf8ccc0a5631b9d0900227e11e13f1)
Reviewed-on: https://gerrit.libreoffice.org/45440
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 9b7f551e57f0..9cc2ae04ddde 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -89,10 +89,10 @@ public: bool operator()(const ::sd::slidesorter::cache::PageCacheManager::BestFittingPageCaches::value_type& rElement1, const ::sd::slidesorter::cache::PageCacheManager::BestFittingPageCaches::value_type& rElement2) { - if (rElement1.first == maPreferredSize) - return true; - else if (rElement2.first == maPreferredSize) + if (rElement2.first == maPreferredSize) return false; + else if (rElement1.first == maPreferredSize) + return true; else return (rElement1.first.Width()*rElement1.first.Height() > rElement2.first.Width()*rElement2.first.Height()); |