diff options
Diffstat (limited to 'sd/source/ui/slidesorter')
8 files changed, 28 insertions, 28 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 0b36058aadb4..c66987be6f8d 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -325,7 +325,7 @@ bool SlideSorterController::Command ( if (aSelectedPages.HasMoreElements()) pPage = aSelectedPages.GetNextElement()->GetPage(); - if (mrModel.GetEditMode() == EM_PAGE) + if (mrModel.GetEditMode() == EditMode::Page) { if (pPage != nullptr) aPopupId = "pagepane"; @@ -740,7 +740,7 @@ void SlideSorterController::PrepareEditModeChange() // Before we throw away the page descriptors we prepare for selecting // descriptors in the other mode and for restoring the current // selection when switching back to the current mode. - if (mrModel.GetEditMode() == EM_PAGE) + if (mrModel.GetEditMode() == EditMode::Page) { maSelectionBeforeSwitch.clear(); @@ -784,7 +784,7 @@ void SlideSorterController::ChangeEditMode (EditMode eEditMode) void SlideSorterController::FinishEditModeChange() { - if (mrModel.GetEditMode() == EM_MASTERPAGE) + if (mrModel.GetEditMode() == EditMode::MasterPage) { mpPageSelector->DeselectAllPages(); diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 4dec3b3e5808..432ec42b2fd0 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -172,7 +172,7 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest) switch (rRequest.GetSlot()) { case SID_CUT: - if (mrSlideSorter.GetModel().GetEditMode() != EM_MASTERPAGE) + if (mrSlideSorter.GetModel().GetEditMode() != EditMode::MasterPage) { if(xFunc.is()) xFunc->DoCut(); @@ -183,7 +183,7 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest) break; case SID_COPY: - if (mrSlideSorter.GetModel().GetEditMode() != EM_MASTERPAGE) + if (mrSlideSorter.GetModel().GetEditMode() != EditMode::MasterPage) { if(xFunc.is()) xFunc->DoCopy(); @@ -197,7 +197,7 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest) // Prevent redraws while inserting pages from the clipboard // because the intermediate inconsistent state might lead to // a crash. - if (mrSlideSorter.GetModel().GetEditMode() != EM_MASTERPAGE) + if (mrSlideSorter.GetModel().GetEditMode() != EditMode::MasterPage) { view::SlideSorterView::DrawLock aLock (mrSlideSorter); SelectionObserver::Context aContext (mrSlideSorter); @@ -847,7 +847,7 @@ Clipboard::DropType Clipboard::IsDropAccepted (DropTargetHelper&) const if (pDragTransferable->IsPageTransferable()) { - if (mrSlideSorter.GetModel().GetEditMode() != EM_MASTERPAGE) + if (mrSlideSorter.GetModel().GetEditMode() != EditMode::MasterPage) return DT_PAGE; else return DT_NONE; diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 4cca82bc1d00..cbaf2dab436c 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -44,7 +44,7 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter) mnInsertionIndex(-1) { // No Drag-and-Drop for master pages. - if (rSlideSorter.GetModel().GetEditMode() != EM_PAGE) + if (rSlideSorter.GetModel().GetEditMode() != EditMode::Page) return; // For properly handling transferables created by the navigator we diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 03206dc3d715..1a78cb6d0e99 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -484,7 +484,7 @@ void SAL_CALL Listener::propertyChange ( bool bIsMasterPageMode = false; rEvent.NewValue >>= bIsMasterPageMode; mrController.ChangeEditMode ( - bIsMasterPageMode ? EM_MASTERPAGE : EM_PAGE); + bIsMasterPageMode ? EditMode::MasterPage : EditMode::Page); } } @@ -547,7 +547,7 @@ void Listener::UpdateEditMode() } } mrController.ChangeEditMode ( - bIsMasterPageMode ? EM_MASTERPAGE : EM_PAGE); + bIsMasterPageMode ? EditMode::MasterPage : EditMode::Page); } void Listener::HandleModelChange (const SdrPage* pPage) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index b6135a34d43f..60fc8565dc03 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -118,7 +118,7 @@ void SelectionManager::DeleteSelectedPages (const bool bSelectFollowingPage) // helper functions. They are specialized for normal respectively for // master pages. mrSlideSorter.GetView().BegUndo (SdResId(STR_UNDO_DELETEPAGES)); - if (mrSlideSorter.GetModel().GetEditMode() == EM_PAGE) + if (mrSlideSorter.GetModel().GetEditMode() == EditMode::Page) DeleteSelectedNormalPages(aSelectedPages); else DeleteSelectedMasterPages(aSelectedPages); @@ -150,7 +150,7 @@ void SelectionManager::DeleteSelectedPages (const bool bSelectFollowingPage) void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>& rSelectedPages) { // Prepare the deletion via the UNO API. - OSL_ASSERT(mrSlideSorter.GetModel().GetEditMode() == EM_PAGE); + OSL_ASSERT(mrSlideSorter.GetModel().GetEditMode() == EditMode::Page); try { @@ -183,7 +183,7 @@ void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>& void SelectionManager::DeleteSelectedMasterPages (const ::std::vector<SdPage*>& rSelectedPages) { // Prepare the deletion via the UNO API. - OSL_ASSERT(mrSlideSorter.GetModel().GetEditMode() == EM_MASTERPAGE); + OSL_ASSERT(mrSlideSorter.GetModel().GetEditMode() == EditMode::MasterPage); try { diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index e65729257426..babb24f2d074 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -541,7 +541,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) if (SfxItemState::DEFAULT == rSet.GetItemState(SID_EXPAND_PAGE)) { bool bDisable = true; - if (eEditMode == EM_PAGE) + if (eEditMode == EditMode::Page) { // At least one of the selected pages has to contain an outline // presentation objects in order to enable the expand page menu @@ -584,7 +584,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) if (SfxItemState::DEFAULT == rSet.GetItemState(SID_SUMMARY_PAGE)) { bool bDisable = true; - if (eEditMode == EM_PAGE) + if (eEditMode == EditMode::Page) { // At least one of the selected pages has to contain a title // presentation objects in order to enable the summary page menu @@ -674,14 +674,14 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) } } - if (eEditMode == EM_MASTERPAGE) + if (eEditMode == EditMode::MasterPage) { rSet.DisableItem(SID_ASSIGN_LAYOUT); rSet.DisableItem(SID_INSERTPAGE); } // Disable some slots when in master page mode. - if (eEditMode == EM_MASTERPAGE) + if (eEditMode == EditMode::MasterPage) { if (rSet.GetItemState(SID_INSERTPAGE) == SfxItemState::DEFAULT) rSet.DisableItem(SID_INSERTPAGE); @@ -743,7 +743,7 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet) || rSet.GetItemState(SID_PASTE_SPECIAL) == SfxItemState::DEFAULT || rSet.GetItemState(SID_CUT) == SfxItemState::DEFAULT) { - if (mrSlideSorter.GetModel().GetEditMode() == EM_MASTERPAGE) + if (mrSlideSorter.GetModel().GetEditMode() == EditMode::MasterPage) { if (rSet.GetItemState(SID_CUT) == SfxItemState::DEFAULT) rSet.DisableItem(SID_CUT); @@ -940,7 +940,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri ::svl::IUndoManager* pManager = pDocument->GetDocSh()->GetUndoManager(); - if( mrSlideSorter.GetModel().GetEditMode() == EM_PAGE ) + if( mrSlideSorter.GetModel().GetEditMode() == EditMode::Page ) { model::SharedPageDescriptor pDescriptor ( mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); @@ -1027,7 +1027,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) PageSelector::BroadcastLock aBroadcastLock (mrSlideSorter); SdPage* pNewPage = nullptr; - if (mrSlideSorter.GetModel().GetEditMode() == EM_PAGE) + if (mrSlideSorter.GetModel().GetEditMode() == EditMode::Page) { SlideSorterViewShell* pShell = dynamic_cast<SlideSorterViewShell*>( mrSlideSorter.GetViewShell()); diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 58d22cf727e9..f28cd44b4467 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -245,11 +245,11 @@ private: bool mbPostModelChangePending; /** This array stores the indices of the selected page descriptors at - the time when the edit mode is switched to EM_MASTERPAGE. With this - we can restore the selection when switching back to EM_PAGE mode. + the time when the edit mode is switched to EditMode::MasterPage. With this + we can restore the selection when switching back to EditMode::Page mode. */ ::std::vector<SdPage*> maSelectionBeforeSwitch; - /// The current page before the edit mode is switched to EM_MASTERPAGE. + /// The current page before the edit mode is switched to EditMode::MasterPage. int mnCurrentPageBeforeSwitch; /** The master page to select after the edit mode is changed. This diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 682904fbb8d9..ebd0943b2c36 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -103,7 +103,7 @@ SlideSorterModel::SlideSorterModel (SlideSorter& rSlideSorter) : maMutex(), mrSlideSorter(rSlideSorter), mxSlides(), - meEditMode(EM_PAGE), + meEditMode(EditMode::Page), maPageDescriptors(0) { } @@ -439,7 +439,7 @@ void SlideSorterModel::UpdatePageList() { switch (meEditMode) { - case EM_MASTERPAGE: + case EditMode::MasterPage: { Reference<drawing::XMasterPagesSupplier> xSupplier ( xController->getModel(), UNO_QUERY); @@ -450,7 +450,7 @@ void SlideSorterModel::UpdatePageList() } break; - case EM_PAGE: + case EditMode::Page: { Reference<drawing::XDrawPagesSupplier> xSupplier ( xController->getModel(), UNO_QUERY); @@ -529,7 +529,7 @@ bool SlideSorterModel::NotifyPageEvent (const SdrPage* pSdrPage) // model. if (pPage->GetPageKind() != PK_STANDARD) return false; - if (pPage->IsMasterPage() != (meEditMode==EM_MASTERPAGE)) + if (pPage->IsMasterPage() != (meEditMode==EditMode::MasterPage)) return false; //NotifyPageEvent is called for add, remove, *and* change position so for @@ -635,7 +635,7 @@ SdPage* SlideSorterModel::GetPage (const sal_Int32 nSdIndex) const SdDrawDocument* pModel = const_cast<SlideSorterModel*>(this)->GetDocument(); if (pModel != nullptr) { - if (meEditMode == EM_PAGE) + if (meEditMode == EditMode::Page) return pModel->GetSdPage ((sal_uInt16)nSdIndex, PK_STANDARD); else return pModel->GetMasterSdPage ((sal_uInt16)nSdIndex, PK_STANDARD); |