diff options
| author | awf <af@openoffice.org> | 2011-11-01 16:18:25 +0000 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-11-23 23:53:50 +0100 |
| commit | f82da782158d8f5b89a6a9057df1a4695425ed75 (patch) | |
| tree | 60f2ff3b735a6fa2c570da9878dddeb927a910a3 /sd | |
| parent | 825839b24d4ad04df17269ef407c844fd6b2cc81 (diff) | |
i118560 - slide sorter: pass PageSelector object by reference
* found as LGPLv3-only fix at svn rev 1196092 (http://svn.apache.org/viewvc?view=revision&revision=1196092)
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index f3a0074b8bfa..e3a86bb146a6 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1156,8 +1156,8 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest) aPagesToSelect.end(), ::boost::bind( static_cast<void (PageSelector::*)(const SdPage*)>(&PageSelector::SelectPage), - rSelector, - _1)); + ::boost::ref(rSelector), + _1)); } IMPL_LINK(SlotManager, UserEventCallback, void*, EMPTYARG) diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 42ab15126607..394dd894e325 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -34,6 +34,8 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <vector> #include <memory> +#include <boost/noncopyable.hpp> + class SdPage; @@ -63,7 +65,7 @@ class SlideSorterController; Indices of pages relate allways to the number of all pages in the model (as returned by GetPageCount()) not just the selected pages. */ -class PageSelector +class PageSelector : private ::boost::noncopyable { public: PageSelector (SlideSorter& rSlideSorter); |