diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-12-12 12:37:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-12 13:39:41 +0000 |
| commit | be366ad7690b190c5ef4dc42311a4df6b7dcce4b (patch) | |
| tree | 3e91034bf21fd6f93c5c6883fa819281678281f9 | |
| parent | 026e9335d792c6557255f064960e0ef6d28728e0 (diff) | |
pages with equal Priority and Class getting dropped
Change-Id: Ib053dc4b6e5fb5f01f48c71a4b295a53c0ec6715
(cherry picked from commit 9790588da4b2de455ffc7a2cc69f26539823c3da)
| -rw-r--r-- | sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index 8db2bced8b64..cdc2b5701f8f 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -40,9 +40,14 @@ public: bool operator() (const Request& rRequest1, const Request& rRequest2) { if (rRequest1.meClass == rRequest2.meClass) - return (rRequest1.mnPriorityInClass > rRequest2.mnPriorityInClass); - else - return (rRequest1.meClass < rRequest2.meClass); + { + if (rRequest1.mnPriorityInClass == rRequest2.mnPriorityInClass) + { + return rRequest1.maKey < rRequest2.maKey; + } + return rRequest1.mnPriorityInClass > rRequest2.mnPriorityInClass; + } + return rRequest1.meClass < rRequest2.meClass; } }; /** Request data is compared arbitrarily by their addresses in memory. |