summaryrefslogtreecommitdiff
path: root/sd/source/ui/slidesorter/controller
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/slidesorter/controller')
-rw-r--r--sd/source/ui/slidesorter/controller/SlsFocusManager.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.hxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx2
6 files changed, 9 insertions, 9 deletions
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;