diff options
Diffstat (limited to 'sd/source/ui/slidesorter/controller/SlsSlotManager.cxx')
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index dff6e004a..a55e8a5c9 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -145,7 +145,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) case SID_PAGES_PER_ROW: if (rRequest.GetArgs() != NULL) { - SFX_REQUEST_ARG(rRequest, pPagesPerRow, SfxUInt16Item, + SFX_REQUEST_ARG(rRequest, pPagesPerRow, SfxUInt16Item, SID_PAGES_PER_ROW, FALSE); if (pPagesPerRow != NULL) { @@ -164,7 +164,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) } rRequest.Done(); break; - + case SID_SELECTALL: mrSlideSorter.GetController().GetPageSelector().SelectAllPages(); rRequest.Done(); @@ -246,7 +246,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) SFX_REQUEST_ARG (rRequest, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE); SFX_REQUEST_ARG (rRequest, pWhatLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE); pShell->mpImpl->AssignLayout( - pDocument->GetSdPage((USHORT)pWhatPage->GetValue(), + pDocument->GetSdPage((USHORT)pWhatPage->GetValue(), mrSlideSorter.GetModel().GetPageType()), (AutoLayout)pWhatLayout->GetValue()); rRequest.Done (); @@ -266,7 +266,7 @@ void SlotManager::FuPermanent (SfxRequest& rRequest) ViewShell* pShell = mrSlideSorter.GetViewShell(); if (pShell == NULL) return; - + if(pShell->GetCurrentFunction().is()) { FunctionReference xEmpty; @@ -312,7 +312,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) case SID_STYLE_FAMILY: if (rRequest.GetArgs() != NULL) { - SdDrawDocument* pDocument + SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument(); if (pDocument != NULL) { @@ -442,7 +442,7 @@ void SlotManager::ExecCtrl (SfxRequest& rRequest) rRequest.Done(); break; } - + case SID_SEARCH_DLG: // We have to handle the SID_SEARCH_DLG slot explicitly because // in some cases (when the slide sorter is displayed in the @@ -477,7 +477,7 @@ void SlotManager::GetAttrState (SfxItemSet& rSet) case SID_PAGES_PER_ROW: rSet.Put ( SfxUInt16Item ( - nSlotId, + nSlotId, (USHORT)mrSlideSorter.GetView().GetLayouter().GetColumnCount() ) ); @@ -515,7 +515,7 @@ void SlotManager::GetCtrlState (SfxItemSet& rSet) // Output quality. if (rSet.GetItemState(SID_OUTPUT_QUALITY_COLOR)==SFX_ITEM_AVAILABLE ||rSet.GetItemState(SID_OUTPUT_QUALITY_GRAYSCALE)==SFX_ITEM_AVAILABLE - ||rSet.GetItemState(SID_OUTPUT_QUALITY_BLACKWHITE)==SFX_ITEM_AVAILABLE + ||rSet.GetItemState(SID_OUTPUT_QUALITY_BLACKWHITE)==SFX_ITEM_AVAILABLE ||rSet.GetItemState(SID_OUTPUT_QUALITY_CONTRAST)==SFX_ITEM_AVAILABLE) { ULONG nMode = mrSlideSorter.GetView().GetWindow()->GetDrawMode(); @@ -537,13 +537,13 @@ void SlotManager::GetCtrlState (SfxItemSet& rSet) break; } - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_COLOR, + rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_COLOR, (BOOL)(nQuality==0))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_GRAYSCALE, + rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_GRAYSCALE, (BOOL)(nQuality==1))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_BLACKWHITE, + rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_BLACKWHITE, (BOOL)(nQuality==2))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_CONTRAST, + rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_CONTRAST, (BOOL)(nQuality==3))); } @@ -551,8 +551,8 @@ void SlotManager::GetCtrlState (SfxItemSet& rSet) { rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, TRUE)); } -} - +} + @@ -582,7 +582,7 @@ void SlotManager::GetMenuState ( SfxItemSet& rSet) rSet.DisableItem(SID_SPELL_DIALOG); rSet.DisableItem(SID_SEARCH_DLG); } - + if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_EXPAND_PAGE)) { bool bDisable = true; @@ -622,7 +622,7 @@ void SlotManager::GetMenuState ( SfxItemSet& rSet) { SdPage* pPage = aSelectedPages.GetNextElement()->GetPage(); SdrObject* pObj = pPage->GetPresObj(PRESOBJ_TITLE); - + if (pObj!=NULL && !pObj->IsEmptyPresObj()) bDisable = false; } @@ -678,15 +678,15 @@ void SlotManager::GetMenuState ( SfxItemSet& rSet) case HideSlideFunction::MIXED: // Show both entries. break; - + case HideSlideFunction::EXCLUDED: rSet.DisableItem(SID_HIDE_SLIDE); break; - + case HideSlideFunction::INCLUDED: rSet.DisableItem(SID_SHOW_SLIDE); break; - + case HideSlideFunction::UNDEFINED: rSet.DisableItem(SID_HIDE_SLIDE); rSet.DisableItem(SID_SHOW_SLIDE); @@ -703,13 +703,13 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet) SdTransferable* pTransferClip = SD_MOD()->pTransferClip; if (rSet.GetItemState(SID_PASTE) == SFX_ITEM_AVAILABLE - || rSet.GetItemState(SID_PASTE2) == SFX_ITEM_AVAILABLE) + || rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_AVAILABLE) { // Keine eigenen Clipboard-Daten? if ( !pTransferClip || !pTransferClip->GetDocShell() ) { rSet.DisableItem(SID_PASTE); - rSet.DisableItem(SID_PASTE2); + rSet.DisableItem(SID_PASTE_SPECIAL); } else { @@ -718,7 +718,7 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet) if( !pTransferDocShell || ( (DrawDocShell*) pTransferDocShell)->GetDoc()->GetPageCount() <= 1 ) { bool bIsPastingSupported (false); - + // No or just one page. Check if there is anything that can be // pasted via a DrawViewShell. ViewShellBase* pBase = mrSlideSorter.GetViewShellBase(); @@ -739,16 +739,16 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet) if ( ! bIsPastingSupported) { rSet.DisableItem(SID_PASTE); - rSet.DisableItem(SID_PASTE2); + rSet.DisableItem(SID_PASTE_SPECIAL); } } } } - // Cut, copy and paste of master pages is not yet implemented properly + // Cut, copy and paste of master pages is not yet implemented properly if (rSet.GetItemState(SID_COPY) == SFX_ITEM_AVAILABLE || rSet.GetItemState(SID_PASTE) == SFX_ITEM_AVAILABLE - || rSet.GetItemState(SID_PASTE2) == SFX_ITEM_AVAILABLE + || rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_AVAILABLE || rSet.GetItemState(SID_CUT) == SFX_ITEM_AVAILABLE) { if (mrSlideSorter.GetModel().GetEditMode() == EM_MASTERPAGE) @@ -759,8 +759,8 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet) rSet.DisableItem(SID_COPY); if (rSet.GetItemState(SID_PASTE) == SFX_ITEM_AVAILABLE) rSet.DisableItem(SID_PASTE); - if (rSet.GetItemState(SID_PASTE2) == SFX_ITEM_AVAILABLE) - rSet.DisableItem(SID_PASTE2); + if (rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_AVAILABLE) + rSet.DisableItem(SID_PASTE_SPECIAL); } } @@ -780,7 +780,7 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet) rSet.DisableItem(SID_COPY); bool bDisable = false; - // The operations that lead to the deletion of a page are valid if + // The operations that lead to the deletion of a page are valid if // a) there is at least one selected page // b) deleting the selected pages leaves at least one page in the // document @@ -845,7 +845,7 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) pPage = aSelectedPages.GetNextElement()->GetPage(); nFirstPage = pPage->GetPageNum()/2; pFirstPage = pPage; - + aPageStr += sal_Unicode(' '); aPageStr += String::CreateFromInt32( nFirstPage + 1 ); aPageStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " )); @@ -871,7 +871,7 @@ void SlotManager::ShowSlideShow( SfxRequest& rReq) if( xPresentation.is() ) { if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) ) - xPresentation->start(); + xPresentation->start(); else xPresentation->rehearseTimings(); } @@ -904,7 +904,7 @@ void SlotManager::RenameSlide (void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( - mrSlideSorter.GetActiveWindow(), + mrSlideSorter.GetActiveWindow(), aPageName, aDescr, RID_SVXDLG_NAME); DBG_ASSERT(aNameDlg, "Dialogdiet fail!"); aNameDlg->SetText( aTitle ); @@ -918,7 +918,7 @@ void SlotManager::RenameSlide (void) if( ! aNewName.Equals( aPageName ) ) { #ifdef DBG_UTIL - bool bResult = + bool bResult = #endif RenameSlideFromDrawViewShell( pSelectedPage->GetPageNum()/2, aNewName ); @@ -963,9 +963,9 @@ bool SlotManager::RenameSlideFromDrawViewShell( USHORT nPageId, const String & r SdPage* pPageToRename = NULL; PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); - + SfxUndoManager* pManager = pDocument->GetDocSh()->GetUndoManager(); - + if( mrSlideSorter.GetModel().GetEditMode() == EM_PAGE ) { model::SharedPageDescriptor pDescriptor ( @@ -1121,7 +1121,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) if (pShell != NULL) { pShell->CreateOrDuplicatePage ( - rRequest, + rRequest, mrSlideSorter.GetModel().GetPageType(), pPreviousPage); } |