diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-09 10:49:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-10 06:54:22 +0100 |
| commit | 5853b0b25d439caa619cac2edd9853ac76f84217 (patch) | |
| tree | beafe3ba9c19581dfbe067edb8771f8075f27585 /sd | |
| parent | db42098d99bd8648fcd7b6f669e3e5ad4142670a (diff) | |
make Pair protected base in Pair/Size/Selection
as part of cleaning up the use of the non-const-ref returning methods.
i.e. methods like
long& X()
And make the classes final.
Change-Id: Ice0aa1932124e77f5ed672b527c2a092ec80c481
Reviewed-on: https://gerrit.libreoffice.org/49475
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 85c65293d485..d070bcd14a6d 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -672,9 +672,9 @@ void AccessibleSlideSorterView::Implementation::UpdateChildren() return; } - const Pair aRange (mrSlideSorter.GetView().GetVisiblePageRange()); - mnFirstVisibleChild = aRange.A(); - mnLastVisibleChild = aRange.B(); + const Range aRange (mrSlideSorter.GetView().GetVisiblePageRange()); + mnFirstVisibleChild = aRange.Min(); + mnLastVisibleChild = aRange.Max(); // Release all children. Clear(); diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index a8349967e801..8da2748ef70d 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -152,7 +152,7 @@ public: The returned pair of page object indices is empty when the second index is lower than the first. */ - Pair const & GetVisiblePageRange(); + Range const & GetVisiblePageRange(); /** Add a shape to the page. Typically used from inside PostModelChange(). diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 0a4998df6f22..529c51413a8a 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -703,7 +703,7 @@ std::shared_ptr<cache::PageCache> const & SlideSorterView::GetPreviewCache() return mpPreviewCache; } -Pair const & SlideSorterView::GetVisiblePageRange() +Range const & SlideSorterView::GetVisiblePageRange() { if ( ! mbPageObjectVisibilitiesValid) DeterminePageObjectVisibilities(); |