diff options
Diffstat (limited to 'sd/source/ui/slidesorter')
17 files changed, 29 insertions, 29 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 43f90da65d7d..c9ed3e2fb4b4 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -160,11 +160,11 @@ public: @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 - are ommited. + are omitted. @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 - are ommited. + are omitted. */ ::std::auto_ptr<CacheIndex> GetCacheIndex ( bool bIncludePrecious, diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index 98304df48956..fa6aaf39ffb2 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -104,7 +104,7 @@ public: void SetBitmapCache (const ::boost::shared_ptr<BitmapCache>& rpCache); private: - /** This mutex is used to guard the queue processor. Be carefull not to + /** This mutex is used to guard the queue processor. Be careful not to mix its use with that of the solar mutex. */ ::osl::Mutex maMutex; diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx index 31a5bbe40c0b..50a76b32bac1 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx @@ -76,7 +76,7 @@ public: void SAL_CALL Terminate (void); protected: - /** This virutal method is called (among others?) from the + /** This virtual method is called (among others?) from the inherited create method and acts as the main function of this thread. */ @@ -95,7 +95,7 @@ private: volatile bool mbCanBeJoined; - /** This mutex is used to guard the queue processor. Be carefull not to + /** This mutex is used to guard the queue processor. Be careful not to mix its use with that of the solar mutex. */ ::osl::Mutex maMutex; diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index e822b2d5d077..6c7348db7c10 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -97,7 +97,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) { if (mbIsVerticalWrapActive) { - // Wrap arround to the bottom row or the one above + // Wrap around to the bottom row or the one above // and go to the correct column. const sal_Int32 nLastIndex (nPageCount-1); const sal_Int32 nLastColumn (nLastIndex % nColumnCount); @@ -131,7 +131,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) { if (mbIsVerticalWrapActive) { - // Wrap arround to the correct column. + // Wrap around to the correct column. mnPageIndex = mnPageIndex % nColumnCount; } else diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx index 047fead3bfe8..344b5f3fd807 100644 --- a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx @@ -136,7 +136,7 @@ HideSlideFunction::ExclusionState HideSlideFunction::GetExclusionState ( switch (eState) { case UNDEFINED: - // Use the first selected page to set the inital value. + // Use the first selected page to set the initial value. eState = bState ? EXCLUDED : INCLUDED; break; diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index ec83e09ecb51..73e1120cde65 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -82,7 +82,7 @@ public: /** Connect to the current controller of the view shell as listener. 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 + When the connection is successful then the flag mbListeningToController is set to <TRUE/>. */ void ConnectToController (void); @@ -154,7 +154,7 @@ private: ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame> mxFrameWeak; /** This object is used to lock the model between some - events. It is refernce counted in order to cope with events that + events. It is references counted in order to cope with events that are expected but never sent. */ ::boost::shared_ptr<SlideSorterController::ModelChangeLock> mpModelChangeLock; diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx index 1fa2fdd29008..76deb3bc58f4 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx @@ -52,7 +52,7 @@ class SelectionCommand : public Command { public: - /** Create a new command object that will on its exection use the given + /** Create a new command object that will on its execution use the given PageSelector to select a set of pages. */ SelectionCommand ( diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index ea434b0ad9ed..12d26e7d6557 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -802,7 +802,7 @@ void SelectionFunction::ProcessKeyEvent (const KeyEvent& rEvent) void SelectionFunction::ProcessEvent (EventDescriptor& rDescriptor) { // The call to ProcessEvent may switch to another mode handler. - // Prevent the untimely destruction of the called handler by aquiring a + // Prevent the untimely destruction of the called handler by acquiring a // temporary reference here. ::boost::shared_ptr<ModeHandler> pModeHandler (mpModeHandler); pModeHandler->ProcessEvent(rDescriptor); @@ -1885,7 +1885,7 @@ bool DragAndDropModeHandler::ProcessButtonUpEvent ( { if (Match(rDescriptor.mnEventCode, BUTTON_UP | LEFT_BUTTON)) { - // The following Process() call may lead to the desctruction + // The following Process() call may lead to the destruction // of rDescriptor.mpHitDescriptor so release our reference to it. rDescriptor.mpHitDescriptor.reset(); mrSelectionFunction.SwitchToNormalMode(); diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 42bc76d59783..74d68d3f9f60 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1308,7 +1308,7 @@ SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet) switch (eState) { case UNDEFINED: - // Use the first selected page to set the inital value. + // Use the first selected page to set the initial value. eState = bState ? EXCLUDED : INCLUDED; break; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx index 9d011e192ac2..c93b04cd1023 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx @@ -39,7 +39,7 @@ class SlideSorterView; namespace sd { namespace slidesorter { namespace controller { -/** A collection of functions that are usefull when creating animations. +/** A collection of functions that are useful when creating animations. They are collected here until a better place is found. */ class AnimationFunction diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index 40da3910109a..6a10edabc9dc 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -66,11 +66,11 @@ public: /** Move the focus from the currently focused page to one that is displayed adjacent to it, either vertically or horizontally. @param eDirection - Direction in which to move the focus. Wrap arround is done + Direction in which to move the focus. Wrap around is done differently when moving vertically or horizontally. Vertical - wrap arround takes place in the same column, i.e. when you are + wrap around takes place in the same column, i.e. when you are in the top row and move up you come out in the bottom row in the - same column. Horizontal wrap arround moves to the next + same column. Horizontal wrap around moves to the next (FMD_RIGHT) or previous (FMD_LEFT) page. Moving to the right from the last page goes to the first page and vice versa. When FMD_NONE is given, the current page index is checked for @@ -218,7 +218,7 @@ private: const bool bScrollToFocus); /** Call all currently registered listeners that a focus change has - happended. The focus may be hidden or shown or moved from one page + happened. The focus may be hidden or shown or moved from one page object to another. */ void NotifyFocusChangeListeners (void) const; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index c2a1a3b192e3..4d439d894025 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -152,7 +152,7 @@ public: When <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 + When called from within UpdateCurrentPage() then this flag is used to prevent a recursion loop. */ void SetPageSelection ( diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 353f2bddd8c9..97d8eb1e94e2 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -65,7 +65,7 @@ public: @param pPage The page pointer can in some situations not be detected from rxPage, e.g. after undo of page deletion. Therefore supply it - seperately. + separately. @param nIndex This index is displayed in the view as page number. It is not necessaryily the page index (not even when you add or subtract 1 diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index ab4e9dc52af4..9efab0a70cc9 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -50,7 +50,7 @@ class InsertPosition; 2.) Desired and minimal and maximal widths of page objects. 3.) Minimal and maximal number of columns. 4.) Vertical and horizontal gaps between objects in adjacent columns. - 5.) Borders arround every page object. + 5.) Borders around every page object. 6.) Vertical and horizontal borders between enclosing page and outer page objects. From these it calculates various output values: @@ -99,7 +99,7 @@ public: sal_Int32 nTopBorder, sal_Int32 nBottomBorder); /** Set the interval of valid column counts. When nMinimalColumnCount - <= nMaximalColumnCount is not fullfilled then the call is ignored. + <= nMaximalColumnCount is not fulfilled then the call is ignored. @param nMinimalColumnCount The default value is 1. The question whether higher values make any sense is left to the caller. @@ -113,7 +113,7 @@ public: calculates the output values. Both given sizes must not be 0 in any dimension or the call is ignored. @param eOrientation - This defines the generaly layout and specifies whether there may + This defines the generally layout and specifies whether there may be more than one row or more than one column. @param rWindowSize The size of the window in pixels that the slide sorter is diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx index 5f22ab5cb373..0c03fae72f4e 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx @@ -99,7 +99,7 @@ public: model::SharedPageDescriptor GetPageDescriptor (void) const; /** Return the border widths in the screen coordinate system of the - border arround the page object. The border contains frames for + border around the page object. The border contains frames for selection, focus, the page name and number, and the indicator for the page transition. @param pDevice diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index 27e74fac5def..998464dc515d 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -54,14 +54,14 @@ private: /** This constructor sets the internal page index to the given value. It does not call AdvanceToNextValidElement() to skip elements that - do not fullfill Predicate. + do not fulfill Predicate. */ inline PageEnumerationImpl ( const SlideSorterModel& rModel, const PageEnumeration::PagePredicate& rPredicate, int nIndex); - /** Skip all elements that do not fullfill Predicate starting with the + /** Skip all elements that do not fulfill Predicate starting with the one pointed to by mnIndex. */ inline void AdvanceToNextValidElement (void); @@ -262,7 +262,7 @@ void PageEnumerationImpl::AdvanceToNextValidElement (void) { SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(mnIndex)); - // Test for the predicate being fullfilled. + // Test for the predicate being fulfilled. if (pDescriptor.get()!=NULL && maPredicate(pDescriptor)) { // This predicate is valid. diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index 003e3b66f398..7380bac935f2 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -138,7 +138,7 @@ namespace { }; /** The source mask is essentially multiplied with the given alpha value. - The result is writen to the result mask. + The result is written to the result mask. */ void AdaptTransparency (AlphaMask& rMask, const AlphaMask& rSourceMask, const double nAlpha) { |