SlideSorterController.cxx (b862c97c) SlideSorterController.cxx (4799f5ba)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 932 unchanged lines hidden (view full) ---

941
942
943
944
945void SlideSorterController::FinishEditModeChange (void)
946{
947 if (mrModel.GetEditMode() == EM_MASTERPAGE)
948 {
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 932 unchanged lines hidden (view full) ---

941
942
943
944
945void SlideSorterController::FinishEditModeChange (void)
946{
947 if (mrModel.GetEditMode() == EM_MASTERPAGE)
948 {
949 mpPageSelector->DeselectAllPages();
950
949 // Search for the master page that was determined in
950 // PrepareEditModeChange() and make it the current page.
951 PageEnumeration aAllPages (PageEnumerationProvider::CreateAllPagesEnumeration(mrModel));
952 while (aAllPages.HasMoreElements())
953 {
954 SharedPageDescriptor pDescriptor (aAllPages.GetNextElement());
955 if (pDescriptor->GetPage() == mpEditModeChangeMasterPage)
956 {
957 GetCurrentSlideManager()->SwitchCurrentSlide(pDescriptor);
951 // Search for the master page that was determined in
952 // PrepareEditModeChange() and make it the current page.
953 PageEnumeration aAllPages (PageEnumerationProvider::CreateAllPagesEnumeration(mrModel));
954 while (aAllPages.HasMoreElements())
955 {
956 SharedPageDescriptor pDescriptor (aAllPages.GetNextElement());
957 if (pDescriptor->GetPage() == mpEditModeChangeMasterPage)
958 {
959 GetCurrentSlideManager()->SwitchCurrentSlide(pDescriptor);
960 mpPageSelector->SelectPage(pDescriptor);
958 break;
959 }
960 }
961 }
962 else
963 {
961 break;
962 }
963 }
964 }
965 else
966 {
967 PageSelector::BroadcastLock aBroadcastLock (*mpPageSelector);
968
964 SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(mnCurrentPageBeforeSwitch));
965 GetCurrentSlideManager()->SwitchCurrentSlide(pDescriptor);
966
967 // Restore the selection.
969 SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(mnCurrentPageBeforeSwitch));
970 GetCurrentSlideManager()->SwitchCurrentSlide(pDescriptor);
971
972 // Restore the selection.
973 mpPageSelector->DeselectAllPages();
968 ::std::vector<SdPage*>::iterator iPage;
969 for (iPage=maSelectionBeforeSwitch.begin();
970 iPage!=maSelectionBeforeSwitch.end();
971 ++iPage)
972 {
973 mpPageSelector->SelectPage(*iPage);
974 }
975 maSelectionBeforeSwitch.clear( );

--- 66 unchanged lines hidden (view full) ---

1042
1043
1044void SlideSorterController::SetDocumentSlides (const Reference<container::XIndexAccess>& rxSlides)
1045{
1046 if (mrModel.GetDocumentSlides() != rxSlides)
1047 {
1048 ModelChangeLock aLock (*this);
1049 PreModelChange();
974 ::std::vector<SdPage*>::iterator iPage;
975 for (iPage=maSelectionBeforeSwitch.begin();
976 iPage!=maSelectionBeforeSwitch.end();
977 ++iPage)
978 {
979 mpPageSelector->SelectPage(*iPage);
980 }
981 maSelectionBeforeSwitch.clear( );

--- 66 unchanged lines hidden (view full) ---

1048
1049
1050void SlideSorterController::SetDocumentSlides (const Reference<container::XIndexAccess>& rxSlides)
1051{
1052 if (mrModel.GetDocumentSlides() != rxSlides)
1053 {
1054 ModelChangeLock aLock (*this);
1055 PreModelChange();
1050
1051 mrModel.SetDocumentSlides(rxSlides);
1052 mrView.Layout();
1053
1056
1054 // Select just the current slide.
1055 PageSelector::BroadcastLock aBroadcastLock (*mpPageSelector);
1056 mpPageSelector->DeselectAllPages();
1057 mpPageSelector->SelectPage(mpCurrentSlideManager->GetCurrentSlide());
1057 mrModel.SetDocumentSlides(rxSlides);
1058 }
1059}
1060
1061
1062
1063
1064::boost::shared_ptr<Animator> SlideSorterController::GetAnimator (void) const
1065{

--- 85 unchanged lines hidden --- 		1058 }
1059}
1060
1061
1062
1063
1064::boost::shared_ptr<Animator> SlideSorterController::GetAnimator (void) const
1065{

--- 85 unchanged lines hidden ---