sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 4 ++-- sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 4 +++- svx/source/sdr/properties/attributeproperties.cxx | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit c8e7d34e3a238c9383151a09f99e7951877a6821 Author: alg <a...@apache.org> Date: Thu Oct 6 14:55:24 2011 +0000 118414: applied patch, added forcing that SfxItemSet inside AttributeProperties::SetModel * found as LGPLv3-only fix at svn rev 1179654 (http://svn.apache.org/viewvc?view=revision&revision=1179654) diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 9edc2a4..cece99f 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -479,8 +479,9 @@ namespace sdr } // each object gets the default Style if there is none set yet. - if(mpItemSet && !GetStyleSheet() && pNewModel && !pNewModel->IsLoading()) + if(!GetStyleSheet() && pNewModel && !pNewModel->IsLoading()) { + GetObjectItemSet(); // i#118414 force ItemSet to allow style to be set SetStyleSheet(pNewModel->GetDefaultStyleSheet(), sal_True); } } commit f82da782158d8f5b89a6a9057df1a4695425ed75 Author: awf <a...@openoffice.org> Date: Tue Nov 1 16:18:25 2011 +0000 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) diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index f3a0074..e3a86bb 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 42ab151..394dd89 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); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits