summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-12-12 12:37:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-12 13:33:16 +0000
commit9790588da4b2de455ffc7a2cc69f26539823c3da (patch)
tree80ca495ff1a1d7d5f1cbd4c320a34a0500d8cc3b /sd
parentbd6dfbae4fd22767e227c5317d6696a70ed61c58 (diff)
pages with equal Priority and Class getting dropped
Change-Id: Ib053dc4b6e5fb5f01f48c71a4b295a53c0ec6715
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx11
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 c01847d02fd1..8c96d83c9ae5 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.