summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/drviews1.cxx
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2018-11-28 22:06:05 -0500
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-07-24 16:02:18 +0200
commit8213923c183c95c58b8c82ab6ad5e3f1611a4202 (patch)
tree29e067d41823ada12cd3bc097d22bb3b8cdaca91 /sd/source/ui/view/drviews1.cxx
parent5ae7908ecec19d2d7f5464bf89fcd26a4aef3ace (diff)
LOK: sd: use native SdPage to flag selection
The slide-sorter is actually still necessary to apply/change the master slide of a given slide, so we must enable it. Change-Id: I3f59f58be76ab1c63453b4f6288044572800a556 Change-Id: I7554ba4afd28d7ea4f3ed6ba375d9765a89ef21c Reviewed-on: https://gerrit.libreoffice.org/69618 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/73497 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/view/drviews1.cxx')
-rw-r--r--sd/source/ui/view/drviews1.cxx26
1 files changed, 5 insertions, 21 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 768bf33ef473..67a651122497 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -774,31 +774,15 @@ bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
*/
bool DrawViewShell::SelectPage(sal_uInt16 nPage, sal_uInt16 nSelect)
{
- slidesorter::SlideSorterViewShell* pSlideSorterViewShell
- = slidesorter::SlideSorterViewShell::GetSlideSorter(GetViewShellBase());
- if (pSlideSorterViewShell != nullptr)
+ SdPage* pPage = GetDoc()->GetSdPage(nPage, PageKind::Standard);
+ if (pPage)
{
- slidesorter::controller::PageSelector& aPageSelector
- = pSlideSorterViewShell->GetSlideSorter().GetController().GetPageSelector();
if (nSelect == 0)
- {
- // Deselect.
- aPageSelector.DeselectPage(nPage);
-
- }
+ pPage->SetSelected(false); // Deselect.
else if (nSelect == 1)
- {
- // Select.
- aPageSelector.SelectPage(nPage);
- }
+ pPage->SetSelected(true); // Select.
else
- {
- // Toggle.
- if (aPageSelector.IsPageSelected(nPage))
- aPageSelector.DeselectPage(nPage);
- else
- aPageSelector.SelectPage(nPage);
- }
+ pPage->SetSelected(!pPage->IsSelected()); // Toggle.
return true;
}