diff options
Diffstat (limited to 'sd/source/ui/slidesorter')
54 files changed, 266 insertions, 266 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 734c630d31ce..34799b08d0a2 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -85,7 +85,7 @@ public: */ void Clear (void); - /** Return <TRUE/> when the cache is full, i.e. the cache compactor had + /** Return <sal_True/> when the cache is full, i.e. the cache compactor had to be run. */ bool IsFull (void) const; @@ -95,11 +95,11 @@ public: */ sal_Int32 GetSize (void); - /** Return <TRUE/> when a preview bitmap exists for the given key. + /** Return <sal_True/> when a preview bitmap exists for the given key. */ bool HasBitmap (const CacheKey& rKey); - /** Return <TRUE/> when a preview bitmap exists for the given key and + /** Return <sal_True/> when a preview bitmap exists for the given key and when it is up-to-date. */ bool BitmapIsUpToDate (const CacheKey& rKey); @@ -121,7 +121,7 @@ public: anymore. @return When the key references a page in the cache then - return <TRUE/>. When the key is not known then <FALSE/> + return <sal_True/>. When the key is not known then <sal_False/> is returned. */ bool InvalidateBitmap (const CacheKey& rKey); @@ -162,12 +162,12 @@ public: part of) the cache. The entries of the index are sorted according to last access times with the least recently access time first. @param bIncludePrecious - When this flag is <TRUE/> entries with the precious flag set are - included in the index. When the flag is <FALSE/> these entries + When this flag is <sal_True/> entries with the precious flag set are + included in the index. When the flag is <sal_False/> these entries are ommited. @param bIncludeNoPreview - When this flag is <TRUE/> entries with that have no preview - bitmaps are included in the index. When the flag is <FALSE/> these entries + When this flag is <sal_True/> entries with that have no preview + bitmaps are included in the index. When the flag is <sal_False/> these entries are ommited. */ ::std::auto_ptr<CacheIndex> GetCacheIndex ( diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index 96636576f79a..e25a40496d15 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -48,7 +48,7 @@ public: @param rPreviewSize The size of the previews is expected in pixel values. @param bDoSuperSampling - When <TRUE/> the previews are rendered larger and then scaled + When <sal_True/> the previews are rendered larger and then scaled down to the requested size to improve image quality. */ GenericPageCache ( @@ -77,9 +77,9 @@ public: @param rRequestData This data is used to determine the preview. @param bResize - When <TRUE/> then when the available bitmap has not the + When <sal_True/> then when the available bitmap has not the requested size, it is scaled before it is returned. When - <FALSE/> then the bitmap is returned in the wrong size and it is + <sal_False/> then the bitmap is returned in the wrong size and it is the task of the caller to scale it. @return Returns a bitmap that is either empty, contains a scaled (up or @@ -103,9 +103,9 @@ public: @param bMayBeUpToDate This flag helps the method to determine whether an existing preview that matches the request is up to date. If the caller - knows that it is not then by passing <FALSE/> he tells us that we + knows that it is not then by passing <sal_False/> he tells us that we do not have to check the up-to-date flag a second time. If - unsure use <TRUE/>. + unsure use <sal_True/>. */ void RequestPreviewBitmap ( const CacheKey aKey, @@ -115,7 +115,7 @@ public: request data with a new one that reflects recent changes in the content of the page object. @return - When the key is kown then return <TRUE/>. + When the key is kown then return <sal_True/>. */ bool InvalidatePreviewBitmap (const CacheKey aKey); diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index f59ec702ac01..722f3a955be8 100644..100755 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx @@ -57,8 +57,8 @@ public: The priority class in which to insert the request with highest or lowest priority. @param bInsertWithHighestPriority - When this flag is <TRUE/> the request is inserted with highes - priority in its class. When <FALSE/> the request is inserted + When this flag is <sal_True/> the request is inserted with highes + priority in its class. When <sal_False/> the request is inserted with lowest priority. */ void AddRequest ( @@ -71,9 +71,9 @@ public: It is OK when the specified request is not a member of the queue. @return - Returns <TRUE/> when the request has been successfully been + Returns <sal_True/> when the request has been successfully been removed from the queue. Otherwise, e.g. because the request was - not a member of the queue, <FALSE/> is returned. + not a member of the queue, <sal_False/> is returned. */ bool RemoveRequest (CacheKey aKey); @@ -94,7 +94,7 @@ public: */ void PopFront (void); - /** Returns <TRUE/> when there is no element in the queue. + /** Returns <sal_True/> when there is no element in the queue. */ bool IsEmpty (void); 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/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 7f65435ff738..a4cd61fc3dd5 100755 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -87,7 +87,7 @@ public: This method is called once during initialization and every time a FrameActionEvent signals the current controller being exchanged. When the connection is successfull then the flag - mbListeningToController is set to <TRUE/>. + mbListeningToController is set to <sal_True/>. */ void ConnectToController (void); @@ -95,7 +95,7 @@ public: listener. This method is called once during initialization and every time a FrameActionEvent signals the current controller being exchanged. When this method terminates then mbListeningToController - is <FALSE/>. + is <sal_False/>. */ void DisconnectFromController (void); 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 0ab4b9e3bdc3..6cf3833468e3 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), diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx index ba3e9346f28f..8596f8a0ce25 100755 --- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx @@ -78,7 +78,7 @@ public: the list of visible entries and maybe for the list of not visible entries and creates preview creation requests for them. @param bVisible - When this is <FALSE/> then the implementation can decide whether + When this is <sal_False/> then the implementation can decide whether to allow rendering of previews that are not visible (ahead of time). When not then return an empty pointer or an empty vector. */ diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index bd2b542c5d87..defcc996dccc 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx @@ -108,9 +108,9 @@ public: @param rRequestData This data is used to determine the preview. @param bResize - When <TRUE/> then when the available bitmap has not the + When <sal_True/> then when the available bitmap has not the requested size, it is scaled before it is returned. When - <FALSE/> then the bitmap is returned in the wrong size and it is + <sal_False/> then the bitmap is returned in the wrong size and it is the task of the caller to scale it. @return Returns a bitmap that is either empty, contains a scaled (up or @@ -137,7 +137,7 @@ public: data is not up-to-date anymore. This will invalidate all previews in other caches that represent the same page as well. @param bRequestPreview - When <TRUE/> then a new preview is requested and will lead + When <sal_True/> then a new preview is requested and will lead eventually to a repaint of the associated page object. */ void InvalidatePreviewBitmap ( @@ -154,8 +154,8 @@ public: This is the case when the size of the page objects on the screen has changed or when the model has changed. @param bUpdateCache - When this flags is <TRUE/> then requests for updated previews - are created. When it is <FALSE/> the existing previews are only + When this flags is <sal_True/> then requests for updated previews + are created. When it is <sal_False/> the existing previews are only marked as not being up-to-date anymore. */ void InvalidateCache (const bool bUpdateCache = true); diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index b6309f80d0b4..e9ef3e0fb725 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -100,7 +100,7 @@ public: filler, the actual slide sorter view--are visible and place them in the area last passed to Resize(). @param bForce - When <TRUE/> is given (<FALSE/> is the default) then the content + When <sal_True/> is given (<sal_False/> is the default) then the content window and with it the SlideSorterView is resized event when its size does not change (the size does change when the visibility of scroll bars changes.) @@ -203,7 +203,7 @@ public: this method should be called between calls to PrepareEditModeChange() and FinishEditModeChange(). @return - A return value of <TRUE/> indicates that the edit mode has + A return value of <sal_True/> indicates that the edit mode has changed. */ bool ChangeEditMode (EditMode eEditMode); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index 2d8418e49631..08be80c4e487 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -123,7 +123,7 @@ private: @param nTime Time measured in milli seconds with some arbitrary reference point. @return - When one or more animation has finished then <TRUE/> is + When one or more animation has finished then <sal_True/> is returned. Call CleanUpAnimationList() in this case. */ bool ProcessAnimations (const double nTime); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 9b7b1f5ec2d3..ae6f2dceb277 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -87,25 +87,25 @@ public: const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); void Abort (void); protected: - virtual USHORT DetermineInsertPosition ( + virtual sal_uInt16 DetermineInsertPosition ( const SdTransferable& rTransferable); - virtual USHORT InsertSlides ( + virtual sal_uInt16 InsertSlides ( const SdTransferable& rTransferable, - USHORT nInsertPosition); + sal_uInt16 nInsertPosition); private: SlideSorter& mrSlideSorter; @@ -126,7 +126,7 @@ private: /** When pages are moved or copied then the selection of the slide sorter has to be updated. This flag is used to remember whether the - selection has to be updated or can stay as it is (FALSE). + selection has to be updated or can stay as it is (sal_False). */ bool mbUpdateSelectionPending; @@ -137,7 +137,7 @@ private: ::boost::scoped_ptr<UndoContext> mpUndoContext; ::boost::scoped_ptr<SelectionObserver::Context> mpSelectionObserverContext; - ULONG mnDragFinishedUserEventId; + sal_uLong mnDragFinishedUserEventId; void CreateSlideTransferable ( ::Window* pWindow, @@ -179,7 +179,7 @@ private: */ void SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount); - /** Return <TRUE/> when the current transferable in the current state of + /** Return <sal_True/> when the current transferable in the current state of the slidesorter is acceptable to be pasted. For this the transferable has to a) exist, @@ -218,8 +218,8 @@ private: const void* pDropEvent , DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer); + sal_uInt16 nPage, + sal_uInt16 nLayer); /** Asynchronous part of DragFinished. The argument is the sal_Int8 nDropAction, disguised as void*. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index f49207a0bd48..1039f4414ab8 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -72,7 +72,7 @@ public: @param nSlideIndex Zero based index in the range [0,number-of-slides). @param bUpdateSelection - When <TRUE/> then the page selection is cleared and only the new + When <sal_True/> then the page selection is cleared and only the new current slide is selected. */ void SwitchCurrentSlide ( diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index 1d5aaee7a130..f86835bfca1b 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -85,7 +85,7 @@ public: /** Show the focus indicator of the current slide. @param bScrollToFocus - When <TRUE/> (the default) then the view is scrolled so that the + When <sal_True/> (the default) then the view is scrolled so that the focus rectangle lies inside its visible area. */ void ShowFocus (const bool bScrollToFocus = true); @@ -137,9 +137,9 @@ public: void SetFocusedPageToCurrentPage (void); - /** Return <TRUE/> when the focus inidcator is currently shown. A + /** Return <sal_True/> when the focus inidcator is currently shown. A prerequisite is that the window managed by this focus manager has - the input focus as indicated by a <TRUE/> return value of + the input focus as indicated by a <sal_True/> return value of HasFocus(). It is not necessary that the focus indicator is visible. It may have been scrolled outside the visible area. */ @@ -214,7 +214,7 @@ private: @param pDescriptor When NULL is given then the call is ignored. @param bScrollToFocus - When <TRUE/> (the default) then the view is scrolled so that the + When <sal_True/> (the default) then the view is scrolled so that the focus rectangle lies inside its visible area. */ void ShowFocusIndicator ( diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index b0a9cfa148cb..cc39463ae73a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -103,7 +103,7 @@ public: /** Deselect the descriptor that is associated with the given page. @param bUpdateCurrentPage - When <TRUE/> then the current page is updated to the first slide + When <sal_True/> then the current page is updated to the first slide of the remaining selection. */ void DeselectPage ( @@ -151,7 +151,7 @@ public: this method with the selection. When pages have been inserted or removed the result may be unexpected. @param bUpdateCurrentPage - When <TRUE/> (the default value) then after setting the + When <sal_True/> (the default value) then after setting the selection update the current page to the first page of the selection. When called from withing UpdateCurrentPage() then this flag is diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 06d239c81da3..8b4ac62e782a 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -45,44 +45,44 @@ public: */ void HandleDataChangeEvent (void); - /** When this method returns <TRUE/> then the current slide is - highlighted in the view. The default value is <FALSE/>. + /** When this method returns <sal_True/> then the current slide is + highlighted in the view. The default value is <sal_False/>. */ bool IsHighlightCurrentSlide (void) const; void SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide); - /** When this method returns <TRUE/> then the selection is indicated in + /** When this method returns <sal_True/> then the selection is indicated in the view (typically by drawing rectangles around the selected - slides.) The default value is <TRUE/>. + slides.) The default value is <sal_True/>. */ bool IsShowSelection (void) const; void SetShowSelection (const bool bIsShowSelection); - /** When this method returns <TRUE/> then the focusdselection is indicated in + /** When this method returns <sal_True/> then the focusdselection is indicated in the view (typically by drawing dotted rectangles around the selected - slides.) The default value is <TRUE/>. + slides.) The default value is <sal_True/>. */ bool IsShowFocus (void) const; void SetShowFocus (const bool bIsShowFocus); - /** When this method returns <TRUE/> then on a selection change the + /** When this method returns <sal_True/> then on a selection change the visible area is adapted so that the selected slides are shown centered in the view. This can be used to center the current slide - by selecting only the current slide. The default value is <FALSE/>. + by selecting only the current slide. The default value is <sal_False/>. */ bool IsCenterSelection (void) const; void SetCenterSelection (const bool bIsCenterSelection); - /** When this mehod returns <TRUE/> then the view may try to change the + /** When this mehod returns <sal_True/> then the view may try to change the visible area by scrolling it smoothly on the screen. Experimental. - Default value is <FALSE/>. + Default value is <sal_False/>. */ bool IsSmoothSelectionScrolling (void) const; void SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrolling); - /** When this method returns <TRUE/> then during a full screen + /** When this method returns <sal_True/> then during a full screen presentation the previews in a slide sorter are not updated. - Default value is <TRUE/>. + Default value is <sal_True/>. */ bool IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const; void SetSuspendPreviewUpdatesDuringFullScreenPresentation (const bool bFlag); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index fa2aae6111fb..f1e674a2ad56 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -101,10 +101,10 @@ public: were inserted or deleted, the layout or the zoom factor has changed. @param bResetThumbPosition - When <TRUE/> then set the thumb position to position 0. This is + When <sal_True/> then set the thumb position to position 0. This is done when e.g. switching between master page mode and draw mode. @param bScrollToCurrentPosition - When <TRUE/> then scroll the window to the new offset that is + When <sal_True/> then scroll the window to the new offset that is defined by the scroll bars. Otherwise the new offset is simply set and the whole window is repainted. */ @@ -119,10 +119,10 @@ public: The scroll bars will be placed inside this rectangle. It is expected to be given in pixel relative to its parent. @param bIsHorizontalScrollBarAllowed - Only when this flag is <TRUE/> the horizontal scroll may be + Only when this flag is <sal_True/> the horizontal scroll may be displayed. @param bIsVerticalScrollBarAllowed - Only when this flag is <TRUE/> the horizontal scroll may be + Only when this flag is <sal_True/> the horizontal scroll may be displayed. @return Returns the space that remains after the scroll bars are @@ -166,8 +166,8 @@ public: @param rAutoScrollFunctor Every time when the window is scrolled then this functor is executed. @return - When the window is scrolled then this method returns <TRUE/>. - When the window is not changed then <FALSE/> is returned. + When the window is scrolled then this method returns <sal_True/>. + When the window is not changed then <sal_False/> is returned. */ bool AutoScroll ( const Point& rMouseWindowPosition, @@ -258,7 +258,7 @@ private: or hidden. @return When the window content can be shown with only being clipped in - an orientation where the scroll bar would be shown then <TRUE/> + an orientation where the scroll bar would be shown then <sal_True/> is returned. */ bool TestScrollBarVisibilities ( diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 9dcd0abb646c..f3963ae04255 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -62,10 +62,10 @@ public: static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx index a9617a88c2e6..49ebfc394ac9 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx @@ -66,9 +66,9 @@ public: /** Delete the currently selected slides. When this method returns the selection is empty. @param bSelectFollowingPage - When <TRUE/> then after deleting the selected pages make the + When <sal_True/> then after deleting the selected pages make the slide after the last selected page the new current page. - When <FALSE/> then make the first slide before the selected + When <sal_False/> then make the first slide before the selected pages the new current slide. */ void DeleteSelectedPages (const bool bSelectFollowingPage = true); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index 5b8c7d9a08b6..f149365f710a 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx @@ -50,9 +50,9 @@ class SlideFunction public: TYPEINFO(); - virtual BOOL MouseMove (const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp (const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown (const MouseEvent& rMEvt); + virtual sal_Bool MouseMove (const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp (const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown (const MouseEvent& rMEvt); /** Called from ForceScroll() before the actual scrolling. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index d2c9f7481624..4a678dcbfd06 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -103,7 +103,7 @@ private: */ void RenameSlide (void); DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*); - bool RenameSlideFromDrawViewShell( USHORT nPageId, const String& rName); + bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String& rName); /** Handle SID_INSERTPAGE slot calls. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx index 289fb1f5f072..c0a09e73bfe9 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx @@ -65,7 +65,7 @@ public: Transferable ( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, - BOOL bInitOnGetData, + sal_Bool bInitOnGetData, SlideSorterViewShell* pViewShell, const ::std::vector<Representative>& rRepresentatives); diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 9dfd861fd5cf..a5fa4a6e0c42 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -59,8 +59,8 @@ namespace sd { namespace slidesorter { namespace model { class DocumentPageContainer; -inline sal_Int32 FromCoreIndex (const USHORT nCoreIndex) { return (nCoreIndex-1)/2; } -inline USHORT ToCoreIndex (const sal_Int32 nIndex) { return nIndex*2+1; } +inline sal_Int32 FromCoreIndex (const sal_uInt16 nCoreIndex) { return (nCoreIndex-1)/2; } +inline sal_uInt16 ToCoreIndex (const sal_Int32 nIndex) { return nIndex*2+1; } /** The model of the slide sorter gives access to the slides that are to be displayed in the slide sorter view. Via the SetDocumentSlides() method @@ -86,7 +86,7 @@ public: previous page descriptor list is replaced by a new one which has to be repainted. @return - A return value of <TRUE/> indicates that the edit mode has + A return value of <sal_True/> indicates that the edit mode has changed and thus the page descriptor list has been set up to reflect that change. A repaint is necessary. */ @@ -112,8 +112,8 @@ public: The index of the requested slide. The valid values are 0 to GetPageCount()-1. @param bCreate - When <TRUE/> and the requested page descriptor is missing then - it is created. When <FALSE/> then an empty reference is + When <sal_True/> and the requested page descriptor is missing then + it is created. When <sal_False/> then an empty reference is returned for missing descriptors. @return When the given index is not valid, i.e. lower then zero or @@ -155,7 +155,7 @@ public: the n*2+1 magic. Only when a special model is set, like a custom slide show, then the returned value is different. */ - USHORT GetCoreIndex (const sal_Int32 nIndex) const; + sal_uInt16 GetCoreIndex (const sal_Int32 nIndex) const; /** Call this method after the document has changed its structure. This will get the model in sync with the SdDrawDocument. This method @@ -221,7 +221,7 @@ public: /** Typically called from controller::Listener this method handles the insertion and deletion of single pages. @return - Returns <TRUE/> when the given page is relevant for the current + Returns <sal_True/> when the given page is relevant for the current page kind and edit mode. */ bool NotifyPageEvent (const SdrPage* pPage); diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 276f1a7c10a7..93b1366b5910 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -112,9 +112,9 @@ public: page it describes and determine whether a redraw to update the selection indicator is necessary. @return - When the two selection states were different <TRUE/> is + When the two selection states were different <sal_True/> is returned. When they were the same this method returns - <FALSE/>. + <sal_False/>. */ bool GetCoreSelection (void); diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 3586eead3532..ec44229515e2 100644..100755 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx @@ -59,7 +59,7 @@ public: The new page enumeration enumerates the pages of this model. @param rPredicate This predicate determines which pages to include in the - enumeration. Pages for which rPredicate returns <FALSE/> are + enumeration. Pages for which rPredicate returns <sal_False/> are exclude. */ typedef ::boost::function<bool(const SharedPageDescriptor&)> PagePredicate; @@ -78,8 +78,8 @@ public: constructor only when you know what you are doing. When in doubt, use the one argument version. @param bCloneImpl - When <TRUE/> is given this constructor behaves exactly like its - one argument version. When <FALSE/> is given then the + When <sal_True/> is given this constructor behaves exactly like its + one argument version. When <sal_False/> is given then the implementation object is not copied but moved from the given enumeration to the newly created one. The given enumeration thus becomes empty. @@ -92,7 +92,7 @@ public: PageEnumeration& operator= (const PageEnumeration& rEnumeration); - /** Return <TRUE/> when the enumeration has more elements, i.e. it is + /** Return <sal_True/> when the enumeration has more elements, i.e. it is save to call GetNextElement() at least one more time. */ virtual bool HasMoreElements (void) const; @@ -100,7 +100,7 @@ public: /** Return the next element of the enumeration. Call the HasMoreElements() before to make sure that there exists at least one more element. Calling this method with HasMoreElements() returning - <FALSE/> is an error. + <sal_False/> is an error. */ virtual SharedPageDescriptor GetNextElement (void); diff --git a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx index 460c915f8a56..bd1651c11bd4 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx @@ -73,7 +73,7 @@ public: /** Return the number of buttons that are to be displayed in page objects which the mouse hovers over. @param bIsExcluded - When this flag is <TRUE/> then return the number of + When this flag is <sal_True/> then return the number of buttons that is to be displayed for pages that are excluded from the slide show. */ @@ -83,7 +83,7 @@ public: @param nIndex Valid values lie in the range [0,GetButtonCount()). @param bIsExcluded - When this flag is <TRUE/> then return a button that is to + When this flag is <sal_True/> then return a button that is to be displayed for pages that are excluded from the slide show. @return @@ -116,8 +116,8 @@ public: /** Request the button bar to be shown. @param bAnimate - This flag controls whether to just show the button bar (<FALSE/>) - or to fade it in smoothly (<TRUE/>.) + This flag controls whether to just show the button bar (<sal_False/>) + or to fade it in smoothly (<sal_True/>.) */ void RequestFadeIn ( const model::SharedPageDescriptor& rpDescriptor, @@ -125,8 +125,8 @@ public: /** Request the button bar to be hidden. @param bAnimate - This flag controls whether to just hide the button bar (<FALSE/>) - or to fade it out smoothly (<TRUE/>.) + This flag controls whether to just hide the button bar (<sal_False/>) + or to fade it out smoothly (<sal_True/>.) */ void RequestFadeOut ( const model::SharedPageDescriptor& rpDescriptor, @@ -217,7 +217,7 @@ public: /** Set a new state. @return When the new state is different from the old state - then <TRUE/> is returned. + then <sal_True/> is returned. */ bool SetState (const State eState); State GetState (void) const; diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 4d19e41e881b..256bab308ee9 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -130,7 +130,7 @@ public: page objects. @return The return value indicates whether the Get... methods can be - used to obtain valid values (<TRUE/>). + used to obtain valid values (<sal_True/>). */ bool Rearrange ( const Orientation eOrientation, @@ -189,16 +189,16 @@ public: The position is expected to be in model coordinates relative to the page origin. @param bIncludePageBorders - When <TRUE/> then include the page borders into the calculation, + When <sal_True/> then include the page borders into the calculation, i.e. when a point lies in the border of a page object but not on the actual page area the index of that page is returned; otherwise -1 would be returned to indicate that no page object has been hit. @param bClampToValidRange - When <TRUE/> then values outside the valid range [0,mnPageCount) + When <sal_True/> then values outside the valid range [0,mnPageCount) are mapped to 0 (when smaller than 0) or mnPageCount-1 when equal to or larger than mnPageCount. - When <FALSE/> then -1 is returned for values outside the valid range. + When <sal_False/> then -1 is returned for values outside the valid range. @return The returned index may be larger than the number of existing page objects. diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx index 31899d3b3e44..e7a06e7f7c25 100755 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx @@ -76,7 +76,7 @@ protected: virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; private: - /** This flag is set to <TRUE/> when the destructor is called to + /** This flag is set to <sal_True/> when the destructor is called to indicate that further calls made to it must not call outside. */ bool mbInDestructor; diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx index 7e884fc54797..65911a1a3474 100644..100755 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx @@ -131,7 +131,7 @@ public: /** Paint a mouse over effect. @param bVisible - When bVisible is <FALSE/> then paint the area of the mouse over + When bVisible is <sal_False/> then paint the area of the mouse over effect in the background color, i.e. erase it. */ drawinglayer::primitive2d::Primitive2DSequence createMouseOverEffectPrimitive2DSequence(); @@ -197,7 +197,7 @@ private: static const sal_Int32 mnMouseOverEffectOffset; static const sal_Int32 mnMouseOverEffectThickness; - /** This flag is set to <TRUE/> when the destructor is called to + /** This flag is set to <sal_True/> when the destructor is called to indicate that further calls made to it must not call outside. */ bool mbInDestructor; diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index 2b39e6d2a3ee..0781d8ea3519 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -227,7 +227,7 @@ private: /** Guarded initialization of the specified icon in the maIcons container. Call only while a LocalResource object is active. */ - void InitializeIcon (const IconType eType, USHORT nResourceId); + void InitializeIcon (const IconType eType, sal_uInt16 nResourceId); }; diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index b633b1f3f5ca..0883b7d39af1 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -77,12 +77,12 @@ private: model::SharedPageDescriptor mpDescriptor; ::rtl::OUString msDefaultHelpText; ::rtl::OUString msCurrentHelpText; - ULONG mnHelpWindowHandle; + sal_uLong mnHelpWindowHandle; Timer maTimer; /** Request to show the tool tip. @param bForce - When <TRUE/> then the tool tip is show right away. Otherwise it + When <sal_True/> then the tool tip is show right away. Otherwise it is shown after a short delay. */ void Show (const bool bForce); diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index be964715f1a6..d439ac4da0a6 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -331,7 +331,7 @@ sal_Int32 SlideSorterModel::GetIndex (const SdrPage* pPage) const -USHORT SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const +sal_uInt16 SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const { SharedPageDescriptor pDescriptor (GetPageDescriptor(nIndex)); if (pDescriptor) @@ -646,7 +646,7 @@ bool SlideSorterModel::NotifyPageEvent (const SdrPage* pSdrPage) void SlideSorterModel::InsertSlide (SdPage* pPage) { // Find the index at which to insert the given page. - USHORT nCoreIndex (pPage->GetPageNum()); + sal_uInt16 nCoreIndex (pPage->GetPageNum()); sal_Int32 nIndex (FromCoreIndex(nCoreIndex)); if (pPage != GetPage(nIndex)) return; @@ -725,9 +725,9 @@ SdPage* SlideSorterModel::GetPage (const sal_Int32 nSdIndex) const if (pModel != NULL) { if (meEditMode == EM_PAGE) - return pModel->GetSdPage ((USHORT)nSdIndex, mePageKind); + return pModel->GetSdPage ((sal_uInt16)nSdIndex, mePageKind); else - return pModel->GetMasterSdPage ((USHORT)nSdIndex, mePageKind); + return pModel->GetMasterSdPage ((sal_uInt16)nSdIndex, mePageKind); } else return NULL; diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 24d744e459d6..f498f1b01e5b 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -206,7 +206,7 @@ bool PageDescriptor::SetState (const State eState, const bool bNewStateValue) // This is a state of the page and has to be handled differently // from the view-only states. if (mpPage != NULL) - if (bNewStateValue != (mpPage->IsExcluded()==TRUE)) + if (bNewStateValue != (mpPage->IsExcluded()==sal_True)) { mpPage->SetExcluded(bNewStateValue); bModified = true; @@ -232,7 +232,7 @@ VisualState& PageDescriptor::GetVisualState (void) bool PageDescriptor::GetCoreSelection (void) { - if (mpPage!=NULL && (mpPage->IsSelected()==TRUE) != mbIsSelected) + if (mpPage!=NULL && (mpPage->IsSelected()==sal_True) != mbIsSelected) return SetState(ST_Selected, !mbIsSelected); else return false; @@ -245,9 +245,9 @@ void PageDescriptor::SetCoreSelection (void) { if (mpPage != NULL) if (HasState(ST_Selected)) - mpPage->SetSelected(TRUE); + mpPage->SetSelected(sal_True); else - mpPage->SetSelected(FALSE); + mpPage->SetSelected(sal_False); else { OSL_ASSERT(mpPage!=NULL); diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index c19c6c331d28..cbf417348bb1 100755 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -500,11 +500,11 @@ void SlideSorter::ArrangeGUIElements ( // Prevent untimely redraws while the view is not yet correctly // resized. view::SlideSorterView::DrawLock aLock (*this); - GetContentWindow()->EnablePaint (FALSE); + GetContentWindow()->EnablePaint (sal_False); mpSlideSorterController->Resize (Rectangle(aOrigin, rSize)); - GetContentWindow()->EnablePaint (TRUE); + GetContentWindow()->EnablePaint (sal_True); mbLayoutPending = false; } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx index 985fb72b38a5..3144ac795eb0 100644..100755 --- a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx @@ -40,7 +40,7 @@ namespace sd { namespace slidesorter { SlideSorterChildWindow::SlideSorterChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow (pParentWindow, nId) @@ -51,7 +51,7 @@ SlideSorterChildWindow::SlideSorterChildWindow ( pParentWindow); eChildAlignment = SFX_ALIGN_LEFT; static_cast<SfxDockingWindow*>(pWindow)->Initialize (pInfo); - // SetHideNotDelete (TRUE); + // SetHideNotDelete (sal_True); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index f8e7e13cdd2b..50426dc39b34 100755 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -544,7 +544,7 @@ void SlideSorterViewShell::ArrangeGUIElements (void) -void SlideSorterViewShell::Activate (BOOL bIsMDIActivate) +void SlideSorterViewShell::Activate (sal_Bool bIsMDIActivate) { ViewShell::Activate(bIsMDIActivate); if (mbIsArrangeGUIElementsPending) @@ -582,7 +582,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) { view::SlideSorterView& rView (mpSlideSorter->GetView()); - USHORT nSlidesPerRow (pFrameView->GetSlidesPerRow()); + sal_uInt16 nSlidesPerRow (pFrameView->GetSlidesPerRow()); if (nSlidesPerRow > 0 && rView.GetOrientation() == view::Layouter::GRID && IsMainViewShell()) @@ -620,7 +620,7 @@ void SlideSorterViewShell::WriteFrameViewData (void) if (mpFrameView != NULL) { view::SlideSorterView& rView (mpSlideSorter->GetView()); - mpFrameView->SetSlidesPerRow((USHORT)rView.GetLayouter().GetColumnCount()); + mpFrameView->SetSlidesPerRow((sal_uInt16)rView.GetLayouter().GetColumnCount()); // DrawMode for 'main' window if( mpFrameView->GetDrawMode() != GetActiveWindow()->GetDrawMode() ) @@ -640,7 +640,7 @@ void SlideSorterViewShell::WriteFrameViewData (void) // We have no current page to set but at least we can make sure // that the index of the frame view has a legal value. if (mpFrameView->GetSelectedPage() >= mpSlideSorter->GetModel().GetPageCount()) - mpFrameView->SetSelectedPage((USHORT)mpSlideSorter->GetModel().GetPageCount()-1); + mpFrameView->SetSelectedPage((sal_uInt16)mpSlideSorter->GetModel().GetPageCount()-1); } } } @@ -738,8 +738,8 @@ sal_Int8 SlideSorterViewShell::AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetClipboard().AcceptDrop ( @@ -757,8 +757,8 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetClipboard().ExecuteDrop ( diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index f3637e55e63c..728eff5ee384 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -175,7 +175,7 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) maVisibilityChangeListeners() { // Hide the page that contains the page objects. - SetPageVisible (FALSE); + SetPageVisible (sal_False); // Register the background painter on level 1 to avoid the creation of a diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index 70655caeda2a..f338a998c56f 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -154,8 +154,8 @@ namespace { for (sal_Int32 nY = 0; nY<nHeight; ++nY) for (sal_Int32 nX = 0; nX<nWidth; ++nX) { - const BYTE nValue (255 - pSourceBitmap->GetPixel(nY, nX).GetBlueOrIndex()); - const BYTE nNewValue (nValue * (1-nAlpha)); + const sal_uInt8 nValue (255 - pSourceBitmap->GetPixel(nY, nX).GetBlueOrIndex()); + const sal_uInt8 nNewValue (nValue * (1-nAlpha)); pBitmap->SetPixel(nY, nX, 255-nNewValue); } } @@ -1291,7 +1291,7 @@ void ImageButton::Paint ( if ( ! mbIsActive) return; - const USHORT nSavedAntialiasingMode (rDevice.GetAntialiasing()); + const sal_uInt16 nSavedAntialiasingMode (rDevice.GetAntialiasing()); rDevice.SetAntialiasing(nSavedAntialiasingMode | ANTIALIASING_ENABLE_B2DDRAW); rDevice.SetLineColor(); diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index 9d2e224aefdf..c3410f88d984 100644..100755 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -111,7 +111,7 @@ FontProvider::SharedFontPointer FontProvider::GetFont (const OutputDevice& rDevi { // Initialize the font from the application style settings. maFont.reset(new Font (Application::GetSettings().GetStyleSettings().GetAppFont())); - maFont->SetTransparent(TRUE); + maFont->SetTransparent(sal_True); maFont->SetWeight(WEIGHT_NORMAL); // Transform the point size to pixel size. diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx index 96ccf51c6323..9b8788b74f27 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx @@ -48,7 +48,7 @@ public: bitmap and replaces that color in all bitmaps by the given new color. Alpha values are not modified. @param bClearCenterBitmap - When <TRUE/> then the center bitmap is erased. + When <sal_True/> then the center bitmap is erased. */ void AdaptColor (const Color aNewColor, const bool bClearCenterBitmap); diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index ee81dbc45202..64b6880a729c 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -108,11 +108,11 @@ public: @param nYPosition Vertical position in model coordinates. @param bIncludeBordersAndGaps - When this flag is <TRUE/> then the area of borders and gaps are + When this flag is <sal_True/> then the area of borders and gaps are interpreted as belonging to one of the rows. @param eGapMembership Specifies to what row the gap areas belong. Here GM_NONE - corresponds to bIncludeBordersAndGaps being <FALSE/>. When + corresponds to bIncludeBordersAndGaps being <sal_False/>. When GM_BOTH is given then the upper half is associated to the row above and the lower half to the row below. Values of GM_PREVIOUS and GM_NEXT associate the whole gap area with the @@ -128,7 +128,7 @@ public: @param nXPosition Horizontal position in model coordinates. @param bIncludeBordersAndGaps - When this flag is <TRUE/> then the area of borders and gaps are + When this flag is <sal_True/> then the area of borders and gaps are interpreted as belonging to one of the columns. @param eGapMembership Specifies to what column the gap areas belong. diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index a0bc19edb470..cb78c1a12f71 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -52,9 +52,9 @@ namespace sd { namespace slidesorter { namespace view { namespace { -UINT8 Blend ( - const UINT8 nValue1, - const UINT8 nValue2, +sal_uInt8 Blend ( + const sal_uInt8 nValue1, + const sal_uInt8 nValue2, const double nWeight) { const double nValue (nValue1*(1-nWeight) + nValue2 * nWeight); @@ -63,7 +63,7 @@ UINT8 Blend ( else if (nValue > 255) return 255; else - return (UINT8)nValue; + return (sal_uInt8)nValue; } sal_uInt8 ClampColorChannel (const double nValue) @@ -118,7 +118,7 @@ PageObjectPainter::PageObjectPainter ( // Replace the color (not the alpha values) in the focus border with a // color derived from the current selection color. Color aColor (mpTheme->GetColor(Theme::Color_Selection)); - USHORT nHue, nSat, nBri; + sal_uInt16 nHue, nSat, nBri; aColor.RGBtoHSB(nHue, nSat, nBri); aColor = Color::HSBtoRGB(nHue, 28, 65); mpFocusBorderPainter->AdaptColor(aColor, true); @@ -149,7 +149,7 @@ void PageObjectPainter::PaintPageObject ( // Turn off antialiasing to avoid the bitmaps from being shifted by // fractions of a pixel and thus show blurry edges. - const USHORT nSavedAntialiasingMode (rDevice.GetAntialiasing()); + const sal_uInt16 nSavedAntialiasingMode (rDevice.GetAntialiasing()); rDevice.SetAntialiasing(nSavedAntialiasingMode & ~ANTIALIASING_ENABLE_B2DDRAW); PaintBackground(rDevice, rpDescriptor); diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 7357d7ea00b8..3949e218c9a8 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -59,9 +59,9 @@ ColorData HGBAdapt ( const sal_Int32 nNewSaturation, const sal_Int32 nNewBrightness) { - USHORT nHue (0); - USHORT nSaturation (0); - USHORT nBrightness (0); + sal_uInt16 nHue (0); + sal_uInt16 nSaturation (0); + sal_uInt16 nBrightness (0); Color(aColorData).RGBtoHSB(nHue, nSaturation, nBrightness); return Color::HSBtoRGB( nHue, @@ -259,13 +259,13 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert { case Font_PageNumber: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(TRUE); + pFont->SetTransparent(sal_True); pFont->SetWeight(WEIGHT_BOLD); break; case Font_PageCount: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(TRUE); + pFont->SetTransparent(sal_True); pFont->SetWeight(WEIGHT_NORMAL); { const Size aSize (pFont->GetSize()); @@ -275,7 +275,7 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert case Font_Button: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(TRUE); + pFont->SetTransparent(sal_True); pFont->SetWeight(WEIGHT_BOLD); { const Size aSize (pFont->GetSize()); @@ -516,7 +516,7 @@ Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType) -void Theme::InitializeIcon (const IconType eType, USHORT nResourceId) +void Theme::InitializeIcon (const IconType eType, sal_uInt16 nResourceId) { if (eType>=0 && size_t(eType)<maIcons.size()) { |