diff options
Diffstat (limited to 'sd/source/ui/slidesorter/controller')
14 files changed, 114 insertions, 114 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 8018c71e2b88..43d5928df349 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -379,7 +379,7 @@ bool SlideSorterController::Command ( case COMMAND_CONTEXTMENU: { SdPage* pPage = NULL; - USHORT nPopupId; + sal_uInt16 nPopupId; model::PageEnumeration aSelectedPages ( PageEnumerationProvider::CreateSelectedPagesEnumeration(mrModel)); @@ -660,7 +660,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) cache::PageCacheManager::Instance()->InvalidateAllCaches(); // Update the draw mode. - ULONG nDrawMode (Application::GetSettings().GetStyleSettings().GetHighContrastMode() + sal_uLong nDrawMode (Application::GetSettings().GetStyleSettings().GetHighContrastMode() ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR); if (mrSlideSorter.GetViewShell() != NULL) @@ -685,7 +685,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) } } - return TRUE; + return sal_True; } @@ -717,8 +717,8 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) { if (mrSlideSorter.GetContentWindow()) { - ULONG nMode = mrSlideSorter.GetContentWindow()->GetDrawMode(); - UINT16 nQuality = 0; + sal_uLong nMode = mrSlideSorter.GetContentWindow()->GetDrawMode(); + sal_uInt16 nQuality = 0; switch (nMode) { @@ -737,19 +737,19 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) } rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_COLOR, - (BOOL)(nQuality==0))); + (sal_Bool)(nQuality==0))); rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_GRAYSCALE, - (BOOL)(nQuality==1))); + (sal_Bool)(nQuality==1))); rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_BLACKWHITE, - (BOOL)(nQuality==2))); + (sal_Bool)(nQuality==2))); rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_CONTRAST, - (BOOL)(nQuality==3))); + (sal_Bool)(nQuality==3))); } } if (rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) == SFX_ITEM_AVAILABLE) { - rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, TRUE)); + rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, sal_True)); } } @@ -996,7 +996,7 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const String& rs break; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - xAccessible (pWindow->GetAccessible(FALSE)); + xAccessible (pWindow->GetAccessible(sal_False)); if ( ! xAccessible.is()) break; diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 68ae50e091e7..823112166bf4 100755 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -233,7 +233,7 @@ void Clipboard::DoDelete (::Window* ) void Clipboard::DoCopy (::Window* pWindow ) { - CreateSlideTransferable( pWindow, FALSE ); + CreateSlideTransferable( pWindow, sal_False ); } @@ -310,25 +310,25 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) SdTransferable* pClipTransferable = SD_MOD()->pTransferClip; model::SlideSorterModel& rModel (mrSlideSorter.GetModel()); bool bMergeMasterPages = !pClipTransferable->HasSourceDoc (rModel.GetDocument()); - USHORT nInsertIndex (rModel.GetCoreIndex(nInsertPosition)); + sal_uInt16 nInsertIndex (rModel.GetCoreIndex(nInsertPosition)); sal_Int32 nInsertPageCount (0); if (pClipTransferable->HasPageBookmarks()) { const List& rBookmarkList = pClipTransferable->GetPageBookmarks(); const ::vos::OGuard aGuard (Application::GetSolarMutex()); - nInsertPageCount = (USHORT) rBookmarkList.Count(); + nInsertPageCount = (sal_uInt16) rBookmarkList.Count(); rModel.GetDocument()->InsertBookmarkAsPage( const_cast<List*>(&rBookmarkList), NULL, - FALSE, - FALSE, + sal_False, + sal_False, nInsertIndex, - FALSE, + sal_False, pClipTransferable->GetPageDocShell(), - TRUE, + sal_True, bMergeMasterPages, - FALSE); + sal_False); } else { @@ -346,14 +346,14 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) rModel.GetDocument()->InsertBookmarkAsPage( NULL, NULL, - FALSE, - FALSE, + sal_False, + sal_False, nInsertIndex, - FALSE, + sal_False, pDataDocSh, - TRUE, + sal_True, bMergeMasterPages, - FALSE); + sal_False); } } mrController.HandleModelChange(); @@ -369,7 +369,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) // after the nInsertIndex position. PageSelector& rSelector (mrController.GetPageSelector()); rSelector.DeselectAllPages(); - for (USHORT i=0; i<nPageCount; i++) + for (sal_uInt16 i=0; i<nPageCount; i++) { model::SharedPageDescriptor pDescriptor ( mrSlideSorter.GetModel().GetPageDescriptor(nFirstIndex + i)); @@ -436,7 +436,7 @@ void Clipboard::CreateSlideTransferable ( SdTransferable* pTransferable = new Transferable ( pDocument, NULL, - FALSE, + sal_False, dynamic_cast<SlideSorterViewShell*>(mrSlideSorter.GetViewShell()), aRepresentatives); @@ -498,7 +498,7 @@ void Clipboard::StartDrag ( maPagesToRemove.clear(); maPagesToSelect.clear(); mbUpdateSelectionPending = false; - CreateSlideTransferable(pWindow, TRUE); + CreateSlideTransferable(pWindow, sal_True); mrController.GetInsertionIndicatorHandler()->UpdatePosition( rPosition, @@ -585,8 +585,8 @@ sal_Int8 Clipboard::AcceptDrop ( const AcceptDropEvent& rEvent, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { sal_Int8 nAction (DND_ACTION_NONE); @@ -655,8 +655,8 @@ sal_Int8 Clipboard::ExecuteDrop ( const ExecuteDropEvent& rEvent, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { sal_Int8 nResult = DND_ACTION_NONE; mpUndoContext.reset(); @@ -680,7 +680,7 @@ sal_Int8 Clipboard::ExecuteDrop ( mrController.GetInsertionIndicatorHandler()); // Get insertion position and then turn off the insertion indicator. pInsertionIndicatorHandler->UpdatePosition(aEventModelPosition, rEvent.mnAction); - // USHORT nIndex = DetermineInsertPosition(*pDragTransferable); + // sal_uInt16 nIndex = DetermineInsertPosition(*pDragTransferable); // Do not process the insertion when it is trivial, // i.e. would insert pages at their original place. @@ -754,7 +754,7 @@ void Clipboard::Abort (void) -USHORT Clipboard::DetermineInsertPosition (const SdTransferable& ) +sal_uInt16 Clipboard::DetermineInsertPosition (const SdTransferable& ) { // Tell the model to move the dragged pages behind the one with the // index nInsertionIndex which first has to be transformed into an index @@ -772,11 +772,11 @@ USHORT Clipboard::DetermineInsertPosition (const SdTransferable& ) -USHORT Clipboard::InsertSlides ( +sal_uInt16 Clipboard::InsertSlides ( const SdTransferable& rTransferable, - USHORT nInsertPosition) + sal_uInt16 nInsertPosition) { - USHORT nInsertedPageCount = ViewClipboard::InsertSlides ( + sal_uInt16 nInsertedPageCount = ViewClipboard::InsertSlides ( rTransferable, nInsertPosition); @@ -827,8 +827,8 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( const void* pDropEvent, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { sal_Int8 nResult = 0; diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 7b2ca60cb4f0..74a97802cf71 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -169,7 +169,7 @@ void CurrentSlideManager::SwitchCurrentSlide ( // The slide sorter is the main view. FrameView* pFrameView = pViewShell->GetFrameView(); if (pFrameView != NULL) - pFrameView->SetSelectedPage(sal::static_int_cast<USHORT>(mnCurrentSlideIndex)); + pFrameView->SetSelectedPage(sal::static_int_cast<sal_uInt16>(mnCurrentSlideIndex)); mrSlideSorter.GetController().GetPageSelector().SetCoreSelection(); } @@ -212,7 +212,7 @@ void CurrentSlideManager::SetCurrentSlideAtViewShellBase (const SharedPageDescri pBase->GetMainViewShell().get()); if (pDrawViewShell != NULL) { - USHORT nPageNumber = (rpDescriptor->GetPage()->GetPageNum()-1)/2; + sal_uInt16 nPageNumber = (rpDescriptor->GetPage()->GetPageNum()-1)/2; pDrawViewShell->SwitchPage(nPageNumber); pDrawViewShell->GetPageTabControl()->SetCurPageId(nPageNumber+1); } @@ -233,7 +233,7 @@ void CurrentSlideManager::SetCurrentSlideAtTabControl (const SharedPageDescripto ::boost::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell())); if (pDrawViewShell) { - USHORT nPageNumber = (rpDescriptor->GetPage()->GetPageNum()-1)/2; + sal_uInt16 nPageNumber = (rpDescriptor->GetPage()->GetPageNum()-1)/2; pDrawViewShell->GetPageTabControl()->SetCurPageId(nPageNumber+1); } } diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 88b294f3202f..76a5f583f4a5 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -86,11 +86,11 @@ void DragAndDropContext::GetPagesFromBookmarks ( if (pDocument == NULL) return; - for (ULONG nIndex=0,nCount=rBookmarks.Count(); nIndex<nCount; ++nIndex) + for (sal_uLong nIndex=0,nCount=rBookmarks.Count(); nIndex<nCount; ++nIndex) { const String sPageName (*static_cast<String*>(rBookmarks.GetObject(nIndex))); - BOOL bIsMasterPage (FALSE); - const USHORT nPageIndex (pDocument->GetPageByName(sPageName, bIsMasterPage)); + sal_Bool bIsMasterPage (sal_False); + const sal_uInt16 nPageIndex (pDocument->GetPageByName(sPageName, bIsMasterPage)); if (nPageIndex == SDRPAGE_NOTFOUND) continue; diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx index dbb65b0f657a..d2ce3f927eec 100755 --- a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx @@ -131,7 +131,7 @@ HideSlideFunction::ExclusionState HideSlideFunction::GetExclusionState ( model::PageEnumeration& rPageSet) { ExclusionState eState (UNDEFINED); - BOOL bState; + sal_Bool bState; // Get toggle state of the selected pages. while (rPageSet.HasMoreElements() && eState!=MIXED) diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 9f1218013e16..009b4fc732b9 100755 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -659,7 +659,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage) // pages that are linked to this master page. if (pPage->IsMasterPage()) { - for (USHORT nIndex=0,nCount=pDocument->GetSdPageCount(PK_STANDARD); + for (sal_uInt16 nIndex=0,nCount=pDocument->GetSdPageCount(PK_STANDARD); nIndex<nCount; ++nIndex) { diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index c94dd6d550b0..e411dc76d6ba 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -310,7 +310,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) mrSlideSorter.GetContentWindow()->SetVisibleXY(-1, nRelativePosition); mrSlideSorter.GetController().GetVisibleAreaManager().DeactivateCurrentSlideTracking(); } - return TRUE; + return sal_True; } @@ -329,7 +329,7 @@ IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar) mrSlideSorter.GetContentWindow()->SetVisibleXY(nRelativePosition, -1); mrSlideSorter.GetController().GetVisibleAreaManager().DeactivateCurrentSlideTracking(); } - return TRUE; + return sal_True; } diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx index 687019954feb..20287d5fe537 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx @@ -54,7 +54,7 @@ SelectionCommand::SelectionCommand ( -void SelectionCommand::AddSlide (USHORT nPageIndex) +void SelectionCommand::AddSlide (sal_uInt16 nPageIndex) { maPagesToSelect.push_back(nPageIndex); } diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx index 7a9d0f27369e..a6589bdffd23 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx @@ -67,7 +67,7 @@ public: /** Remember the specified page to be selected when this command is executed. */ - void AddSlide (USHORT nPageIndex); + void AddSlide (sal_uInt16 nPageIndex); /** Execute the command and select the pages added by previous calls to AddPages() and AddPage(). diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 1d4d075fc3ce..fc5687e0afc0 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -398,7 +398,7 @@ FunctionReference SelectionFunction::Create( -BOOL SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) +sal_Bool SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode (rEvent.GetButtons()); @@ -409,22 +409,22 @@ BOOL SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) ProcessMouseEvent(BUTTON_DOWN, rEvent); - return TRUE; + return sal_True; } -BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent) +sal_Bool SelectionFunction::MouseMove (const MouseEvent& rEvent) { ProcessMouseEvent(MOUSE_MOTION, rEvent); - return TRUE; + return sal_True; } -BOOL SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) +sal_Bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) { mrController.GetScrollBarManager().StopAutoScroll (); @@ -433,7 +433,7 @@ BOOL SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) mbProcessingMouseButtonDown = false; // mpWindow->ReleaseMouse(); - return TRUE; + return sal_True; } @@ -447,12 +447,12 @@ void SelectionFunction::NotifyDragFinished (void) -BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) +sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent) { view::SlideSorterView::DrawLock aDrawLock (mrSlideSorter); PageSelector::UpdateLock aLock (mrSlideSorter); FocusManager& rFocusManager (mrController.GetFocusManager()); - BOOL bResult = FALSE; + sal_Bool bResult = sal_False; const KeyCode& rCode (rEvent.GetKeyCode()); switch (rCode.GetCode()) @@ -477,7 +477,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) SID_INSERTPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } - bResult = TRUE; + bResult = sal_True; } break; } @@ -486,7 +486,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) if ( ! rFocusManager.IsFocusShowing()) { rFocusManager.ShowFocus(); - bResult = TRUE; + bResult = sal_True; } break; @@ -495,7 +495,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) // operation then stop that. mpModeHandler->Abort(); SwitchToNormalMode(); - bResult = TRUE; + bResult = sal_True; break; case KEY_SPACE: @@ -509,7 +509,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) else mrController.GetPageSelector().SelectPage(pDescriptor); } - bResult = TRUE; + bResult = sal_True; } break; @@ -517,47 +517,47 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) // Move the focus indicator left. case KEY_LEFT: MoveFocus(FocusManager::FMD_LEFT, rCode.IsShift(), rCode.IsMod1()); - bResult = TRUE; + bResult = sal_True; break; // Move the focus indicator right. case KEY_RIGHT: MoveFocus(FocusManager::FMD_RIGHT, rCode.IsShift(), rCode.IsMod1()); - bResult = TRUE; + bResult = sal_True; break; // Move the focus indicator up. case KEY_UP: MoveFocus(FocusManager::FMD_UP, rCode.IsShift(), rCode.IsMod1()); - bResult = TRUE; + bResult = sal_True; break; // Move the focus indicator down. case KEY_DOWN: MoveFocus(FocusManager::FMD_DOWN, rCode.IsShift(), rCode.IsMod1()); - bResult = TRUE; + bResult = sal_True; break; // Go to previous page. No wrap around. case KEY_PAGEUP: GotoNextPage(-1); - bResult = TRUE; + bResult = sal_True; break; // Go to next page. No wrap around.. case KEY_PAGEDOWN: GotoNextPage(+1); - bResult = TRUE; + bResult = sal_True; break; case KEY_HOME: GotoPage(0); - bResult = TRUE; + bResult = sal_True; break; case KEY_END: GotoPage(mrSlideSorter.GetModel().GetPageCount()-1); - bResult = TRUE; + bResult = sal_True; break; case KEY_DELETE: @@ -569,7 +569,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) mrController.GetSelectionManager()->DeleteSelectedPages(rCode.GetCode()==KEY_DELETE); mnShiftKeySelectionAnchor = -1; - bResult = TRUE; + bResult = sal_True; } break; @@ -748,7 +748,7 @@ void SelectionFunction::GotoNextPage (int nOffset) void SelectionFunction::GotoPage (int nIndex) { - USHORT nPageCount = (USHORT)mrSlideSorter.GetModel().GetPageCount(); + sal_uInt16 nPageCount = (sal_uInt16)mrSlideSorter.GetModel().GetPageCount(); if (nIndex >= nPageCount) nIndex = nPageCount - 1; @@ -1260,7 +1260,7 @@ void SelectionFunction::ModeHandler::SwitchView (const model::SharedPageDescript { if (rpDescriptor.get()!=NULL && rpDescriptor->GetPage()!=NULL) { - mrSlideSorter.GetModel().GetDocument()->SetSelected(rpDescriptor->GetPage(), TRUE); + mrSlideSorter.GetModel().GetDocument()->SetSelected(rpDescriptor->GetPage(), sal_True); pViewShell->GetFrameView()->SetSelectedPage( (rpDescriptor->GetPage()->GetPageNum()-1)/2); } @@ -1542,15 +1542,15 @@ void NormalModeHandler::RangeSelect (const model::SharedPageDescriptor& rpDescri { // Select all pages between the anchor and the given one, including // the two. - const USHORT nAnchorIndex ((pAnchor->GetPage()->GetPageNum()-1) / 2); - const USHORT nOtherIndex ((rpDescriptor->GetPage()->GetPageNum()-1) / 2); + const sal_uInt16 nAnchorIndex ((pAnchor->GetPage()->GetPageNum()-1) / 2); + const sal_uInt16 nOtherIndex ((rpDescriptor->GetPage()->GetPageNum()-1) / 2); // Iterate over all pages in the range. Start with the anchor // page. This way the PageSelector will recognize it again as // anchor (the first selected page after a DeselectAllPages() // becomes the anchor.) - const USHORT nStep ((nAnchorIndex < nOtherIndex) ? +1 : -1); - USHORT nIndex (nAnchorIndex); + const sal_uInt16 nStep ((nAnchorIndex < nOtherIndex) ? +1 : -1); + sal_uInt16 nIndex (nAnchorIndex); while (true) { rSelector.SelectPage(nIndex); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index d9062a4ef2b1..07c2c267d1d8 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -189,7 +189,7 @@ void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>& if (xPages->getCount() <= 1) break; - const USHORT nPage (model::FromCoreIndex((*aI)->GetPageNum())); + const sal_uInt16 nPage (model::FromCoreIndex((*aI)->GetPageNum())); Reference< XDrawPage > xPage( xPages->getByIndex( nPage ), UNO_QUERY_THROW ); xPages->remove(xPage); @@ -225,7 +225,7 @@ void SelectionManager::DeleteSelectedMasterPages (const ::std::vector<SdPage*>& if (xPages->getCount() <= 1) break; - const USHORT nPage (model::FromCoreIndex((*aI)->GetPageNum())); + const sal_uInt16 nPage (model::FromCoreIndex((*aI)->GetPageNum())); Reference< XDrawPage > xPage( xPages->getByIndex( nPage ), UNO_QUERY_THROW ); xPages->remove(xPage); diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx index 1af831c2ad8a..da7971983dcd 100755 --- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx @@ -61,20 +61,20 @@ void SlideFunction::ScrollEnd (void) { } -BOOL SlideFunction::MouseMove(const MouseEvent& ) +sal_Bool SlideFunction::MouseMove(const MouseEvent& ) { - return FALSE; + return sal_False; } -BOOL SlideFunction::MouseButtonUp(const MouseEvent& ) +sal_Bool SlideFunction::MouseButtonUp(const MouseEvent& ) { - return FALSE; + return sal_False; } -BOOL SlideFunction::MouseButtonDown(const MouseEvent& ) +sal_Bool SlideFunction::MouseButtonDown(const MouseEvent& ) { - return FALSE; + return sal_False; } } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 9fb7fbed87e6..048880f2a8aa 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -164,7 +164,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) if (rRequest.GetArgs() != NULL) { SFX_REQUEST_ARG(rRequest, pPagesPerRow, SfxUInt16Item, - SID_PAGES_PER_ROW, FALSE); + SID_PAGES_PER_ROW, sal_False); if (pPagesPerRow != NULL) { sal_Int32 nColumnCount = pPagesPerRow->GetValue(); @@ -400,7 +400,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) SlideSorterController::ModelChangeLock aModelLock (mrSlideSorter.GetController()); PageSelector::UpdateLock aUpdateLock (mrSlideSorter); SelectionObserver::Context aContext (mrSlideSorter); - pViewShell->ImpSidUndo (FALSE, rRequest); + pViewShell->ImpSidUndo (sal_False, rRequest); } break; } @@ -415,7 +415,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) SlideSorterController::ModelChangeLock aModelLock (mrSlideSorter.GetController()); PageSelector::UpdateLock aUpdateLock (mrSlideSorter); SelectionObserver::Context aContext (mrSlideSorter); - pViewShell->ImpSidRedo (FALSE, rRequest); + pViewShell->ImpSidRedo (sal_False, rRequest); } break; } @@ -431,7 +431,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) void SlotManager::ExecCtrl (SfxRequest& rRequest) { ViewShell* pViewShell = mrSlideSorter.GetViewShell(); - USHORT nSlot = rRequest.GetSlot(); + sal_uInt16 nSlot = rRequest.GetSlot(); switch (nSlot) { case SID_RELOAD: @@ -497,10 +497,10 @@ void SlotManager::GetAttrState (SfxItemSet& rSet) { // Iteratate over all items. SfxWhichIter aIter (rSet); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) { - USHORT nSlotId (nWhich); + sal_uInt16 nSlotId (nWhich); if (SfxItemPool::IsWhich(nWhich) && mrSlideSorter.GetViewShell()!=NULL) nSlotId = mrSlideSorter.GetViewShell()->GetPool().GetSlotId(nWhich); switch (nSlotId) @@ -509,7 +509,7 @@ void SlotManager::GetAttrState (SfxItemSet& rSet) rSet.Put ( SfxUInt16Item ( nSlotId, - (USHORT)mrSlideSorter.GetView().GetLayouter().GetColumnCount() + (sal_uInt16)mrSlideSorter.GetView().GetLayouter().GetColumnCount() ) ); break; @@ -526,15 +526,15 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) if (pShell!=NULL && pShell->GetCurrentFunction().is()) { - USHORT nSId = pShell->GetCurrentFunction()->GetSlotID(); + sal_uInt16 nSId = pShell->GetCurrentFunction()->GetSlotID(); - rSet.Put( SfxBoolItem( nSId, TRUE ) ); + rSet.Put( SfxBoolItem( nSId, sal_True ) ); } - rSet.Put( SfxBoolItem( SID_DRAWINGMODE, FALSE ) ); - rSet.Put( SfxBoolItem( SID_DIAMODE, TRUE ) ); - rSet.Put( SfxBoolItem( SID_OUTLINEMODE, FALSE ) ); - rSet.Put( SfxBoolItem( SID_NOTESMODE, FALSE ) ); - rSet.Put( SfxBoolItem( SID_HANDOUTMODE, FALSE ) ); + rSet.Put( SfxBoolItem( SID_DRAWINGMODE, sal_False ) ); + rSet.Put( SfxBoolItem( SID_DIAMODE, sal_True ) ); + rSet.Put( SfxBoolItem( SID_OUTLINEMODE, sal_False ) ); + rSet.Put( SfxBoolItem( SID_NOTESMODE, sal_False ) ); + rSet.Put( SfxBoolItem( SID_HANDOUTMODE, sal_False ) ); // Vorlagenkatalog darf nicht aufgerufen werden rSet.DisableItem(SID_STYLE_CATALOG); @@ -616,7 +616,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) ) { - BOOL bDisable = TRUE; + sal_Bool bDisable = sal_True; model::PageEnumeration aAllPages ( model::PageEnumerationProvider::CreateAllPagesEnumeration(mrSlideSorter.GetModel())); while (aAllPages.HasMoreElements()) @@ -624,7 +624,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) SdPage* pPage = aAllPages.GetNextElement()->GetPage(); if( !pPage->IsExcluded() ) - bDisable = FALSE; + bDisable = sal_False; } if( bDisable || pDocShell->IsPreview()) { @@ -830,8 +830,8 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) */ SdPage* pPage = NULL; SdPage* pFirstPage = NULL; - USHORT nFirstPage; - USHORT nSelectedPages = (USHORT)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); + sal_uInt16 nFirstPage; + sal_uInt16 nSelectedPages = (sal_uInt16)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); String aPageStr; String aLayoutStr; @@ -959,9 +959,9 @@ IMPL_LINK(SlotManager, RenameSlideHdl, AbstractSvxNameDialog*, pDialog) && mrSlideSorter.GetViewShell()->GetDocSh()->IsNewPageNameValid( aNewName ) )); } -bool SlotManager::RenameSlideFromDrawViewShell( USHORT nPageId, const String & rName ) +bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String & rName ) { - BOOL bOutDummy; + sal_Bool bOutDummy; SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument(); if( pDocument->GetPageByName( rName, bOutDummy ) != SDRPAGE_NOTFOUND ) return false; @@ -983,8 +983,8 @@ bool SlotManager::RenameSlideFromDrawViewShell( USHORT nPageId, const String & r // Undo SdPage* pUndoPage = pPageToRename; SdrLayerAdmin & rLayerAdmin = pDocument->GetLayerAdmin(); - BYTE nBackground = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), FALSE ); - BYTE nBgObj = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), FALSE ); + sal_uInt8 nBackground = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), sal_False ); + sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), sal_False ); SetOfByte aVisibleLayers = pPageToRename->TRG_GetMasterPageVisibleLayers(); // (#67720#) @@ -1018,7 +1018,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( USHORT nPageId, const String & r } } - bool bSuccess = pPageToRename!=NULL && ( FALSE != rName.Equals( pPageToRename->GetName())); + bool bSuccess = pPageToRename!=NULL && ( sal_False != rName.Equals( pPageToRename->GetName())); if( bSuccess ) { @@ -1026,10 +1026,10 @@ bool SlotManager::RenameSlideFromDrawViewShell( USHORT nPageId, const String & r // aTabControl.SetPageText( nPageId, rName ); // set document to modified state - pDocument->SetChanged( TRUE ); + pDocument->SetChanged( sal_True ); // inform navigator about change - SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); if (mrSlideSorter.GetViewShell() != NULL) mrSlideSorter.GetViewShell()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -1092,8 +1092,8 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) // Create shapes for the default layout. pNewPage = pDocument->GetMasterSdPage( - (USHORT)(nInsertionIndex+1), PK_STANDARD); - pNewPage->CreateTitleAndLayout (TRUE,TRUE); + (sal_uInt16)(nInsertionIndex+1), PK_STANDARD); + pNewPage->CreateTitleAndLayout (sal_True,sal_True); } } } @@ -1300,7 +1300,7 @@ namespace { SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet) { SlideExclusionState eState (UNDEFINED); - BOOL bState; + sal_Bool bState; // Get toggle state of the selected pages. while (rPageSet.HasMoreElements() && eState!=MIXED) diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx b/sd/source/ui/slidesorter/controller/SlsTransferable.cxx index efda2eb1e4eb..1f03c70759b6 100755 --- a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferable.cxx @@ -38,7 +38,7 @@ namespace sd { namespace slidesorter { namespace controller { Transferable::Transferable ( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, - BOOL bInitOnGetData, + sal_Bool bInitOnGetData, SlideSorterViewShell* pViewShell, const ::std::vector<Representative>& rRepresentatives) : SdTransferable (pSrcDoc, pWorkView, bInitOnGetData), |