diff options
author | Andre Fischer <af@openoffice.org> | 2010-06-09 11:25:44 +0200 |
---|---|---|
committer | Andre Fischer <af@openoffice.org> | 2010-06-09 11:25:44 +0200 |
commit | 260dd6af0f55fcb0ee256e1b3f9d1d313bd4ff52 (patch) | |
tree | 87d757089ab8c28c3a056b5e976f1868bd11b95b /sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | |
parent | 831ed5d6015c274d63ce323fbbb8d0a2994fab18 (diff) |
renaissance1: #i107215# RETURN inserts new slide (int slide sorter pane). Turned of tracking of current slide when mouse wheel is used.
Diffstat (limited to 'sd/source/ui/slidesorter/controller/SlsPageSelector.cxx')
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index a29ef339fa86..51eb81fae214 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -195,6 +195,8 @@ void PageSelector::SelectPage (const SharedPageDescriptor& rpDescriptor) else mrController.GetSelectionManager()->SelectionHasChanged(); UpdateCurrentPage(); + + CheckConsistency(); } } @@ -244,6 +246,27 @@ void PageSelector::DeselectPage ( mrController.GetSelectionManager()->SelectionHasChanged(); if (bUpdateCurrentPage) UpdateCurrentPage(); + + CheckConsistency(); + } +} + + + + +void PageSelector::CheckConsistency (void) const +{ + int nSelectionCount (0); + for (int nPageIndex=0,nPageCount=mrModel.GetPageCount(); nPageIndex<nPageCount; nPageIndex++) + { + SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); + assert(pDescriptor); + if (pDescriptor->HasState(PageDescriptor::ST_Selected)) + ++nSelectionCount; + } + if (nSelectionCount!=mnSelectedPageCount) + { + assert(nSelectionCount==mnSelectedPageCount); } } |