summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleViewForwarder.cxx2
-rw-r--r--sd/source/ui/dlg/dlgass.cxx2
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx2
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx2
-rw-r--r--sd/source/ui/inc/OutlineView.hxx2
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx2
-rw-r--r--sd/source/ui/inc/ToolBarManager.hxx2
-rw-r--r--sd/source/ui/inc/ViewShellHint.hxx2
-rw-r--r--sd/source/ui/inc/Window.hxx2
-rw-r--r--sd/source/ui/inc/fupoor.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/TitledControl.hxx2
-rw-r--r--sd/source/ui/inc/tools/IconCache.hxx2
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.hxx2
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.hxx6
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.hxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx4
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx6
-rw-r--r--sd/source/ui/view/FormShellManager.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx2
27 files changed, 33 insertions, 33 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 0819cede035c..04087ea2811c 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -522,7 +522,7 @@ uno::Sequence< sal_Int32 > SAL_CALL
uno::Reference< drawing::XShape > xShape = mpChildrenManager->GetChildShape(i);
if ( xShape.is() )
{
- //if the object is visable in the page, we add it into the group list.
+ //if the object is visible in the page, we add it into the group list.
SdrObject* pObj = GetSdrObjectFromXShape(xShape);
if ( pObj && pPV && pSdView && pSdView->IsObjMarkable( pObj, pPV ) )
{
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 2a51ef286616..9bd85c0d95ef 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -814,7 +814,7 @@ void AccessibleSlideSorterView::Implementation::RequestUpdateChildren (void)
void AccessibleSlideSorterView::Implementation::UpdateChildren (void)
{
- //By default, all children should be accessable. So here workaround is to make all children visible.
+ //By default, all children should be accessible. So here workaround is to make all children visible.
// MT: THis was in UpdateVisibility, which has some similarity, and hg merge automatically has put it here. Correct?!
// In the IA2 CWS, also setting mnFirst/LastVisibleChild was commented out!
mnLastVisibleChild = maPageObjects.size();
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index b4a2815a5d9f..bdb4141281a8 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -27,7 +27,7 @@ namespace accessibility {
/** For the time beeing, the implementation of this class will not use the
member mrDevice. Instead the device is retrieved from the view
- everytime it is used. This is necessary because the device has to stay
+ every time it is used. This is necessary because the device has to stay
up-to-date with the current view and the class has to stay compatible.
May change in the future.
*/
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 4868054c0d36..269b52a891ec 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -109,7 +109,7 @@ public:
/** A simple wrapper that looks like a PushButton and is used to force the
- broadcasting of focus events primarly for accessibility tools.
+ broadcasting of focus events primarily for accessibility tools.
Forcing focus events is achieved by using two identical PushButtons
which, when the focus event is requested, are exchanged and play focus
ping-pong by moving the focus from one to the other.
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index 6d1873280b51..2e857d08f03f 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -78,7 +78,7 @@ namespace accessibility {
<li>As window listener it waits for changes of the window geometry and
forwards those as view forwarder changes.</li>
<li>As focus listener it keeps track of the focus to give this class and
- derived classes the oportunity to set and remove the focus to/from
+ derived classes the opportunity to set and remove the focus to/from
shapes.</li>
</ol>
</p>
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 87670c1da23b..96c5c9c94de6 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -468,7 +468,7 @@ private:
a) it is running in its own frame, i.e. is a full screen show and
b) the given flag bCloseFrame is true.
@param bCloseFrame
- Be carefull with this flag when stopping a full screen show.
+ Be careful with this flag when stopping a full screen show.
When called from the destructor the flag has to be <FALSE/> or
otherwise we run into a loop of calls to destructors of the view
and the frame.
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index bf90ecb58a0e..8df6870572bf 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -146,7 +146,7 @@ public:
/** After this method has been called with <TRUE/> following changes of
the current page are ignored in that the corresponding text is not
selected.
- This is used to supress unwanted side effects between selection and
+ This is used to suppress unwanted side effects between selection and
cursor position.
*/
void IgnoreCurrentPageChanges (bool bIgnore);
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index efe71ad63a0b..2781d367afcf 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -182,7 +182,7 @@ public:
*/
void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction);
- /** Return a collection of properties that are used througout the slide
+ /** Return a collection of properties that are used throughout the slide
sorter.
*/
::boost::shared_ptr<controller::Properties> GetProperties (void) const;
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index 5f616ec47b86..bc10d995824e 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -48,7 +48,7 @@ class ViewShellManager;
Tool bars are managed in groups. Each group can be set, reset, or
modified independently of the others. This allows for instance to
replace the toolbars associated with the current function independently
- from those assoicated with the main view.
+ from those associated with the main view.
The ToolBarManager has two high level methods which contain the
knowledge about which tool bars to show in a specific context.
diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx
index 6a10b4d30afd..677ca5dc982b 100644
--- a/sd/source/ui/inc/ViewShellHint.hxx
+++ b/sd/source/ui/inc/ViewShellHint.hxx
@@ -25,7 +25,7 @@
namespace sd {
/** Local derivation of the SfxHint class that defines some hint ids that
- are used by the ViewShell class and its decendants.
+ are used by the ViewShell class and its descendants.
*/
class ViewShellHint
: public SfxHint
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index da54789d6271..09ff31f89796 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -116,7 +116,7 @@ public:
void SetViewSize(const Size& rSize);
void SetCenterAllowed (bool bIsAllowed);
- /** Calculate origin of the map mode accoring to the size of the view
+ /** Calculate origin of the map mode according to the size of the view
and window (its size in model coordinates; that takes the zoom
factor into account), and the bCenterAllowed flag. When it is not
set then nothing is changed. When in any direction the window is
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index 8909694f186b..b86905753fb3 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -106,7 +106,7 @@ public:
// #i33136#
/** Decide if the object to be created should be created
orthogonal. Default implementation uses nSlotID
- to decide. May be overloaded to use other criterias
+ to decide. May be overloaded to use other criteria
for this decision
@returns true if the to be created object should be orthogonal.
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx
index c7dae079a4c6..33f8d737dcf3 100644
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -94,7 +94,7 @@ public:
const OUString& GetTitle (void) const;
/** Expand the control without informing its container. This
- method ususally is called by the container as a result of a
+ method usually is called by the container as a result of a
higher level expand command. You may want to use
ExpandViaContainer() instead.
@param bExpanded
diff --git a/sd/source/ui/inc/tools/IconCache.hxx b/sd/source/ui/inc/tools/IconCache.hxx
index 7f8cec023c1d..a39e1de01e00 100644
--- a/sd/source/ui/inc/tools/IconCache.hxx
+++ b/sd/source/ui/inc/tools/IconCache.hxx
@@ -29,7 +29,7 @@ namespace sd {
use the icons do not have to store them in every one of their
instances.
- Icons are adressed over their resource id and are loaded on demand.
+ Icons are addressed over their resource id and are loaded on demand.
This cache acts like a singleton with a lifetime equal to that of the sd
module.
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index 6c5c8f236a08..c45a8b1cd623 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -92,7 +92,7 @@ public:
rxSharedCanvas argument.
@param rxWindow
The window that is represented by the new PresenterCanvas
- object. It is expected to be a direct decendent of
+ object. It is expected to be a direct descendant of
rxSharedWindow. Its position inside rxSharedWindow defines the
offset of the canvas implemented by the new PresenterCanvas
object and rxSharedCanvas.
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 72b52cf2929d..c65b400e6154 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -89,7 +89,7 @@ public:
virtual sal_Int32 GetMinimumWidth (void);
/** Update the selection of previews according to whatever
- influences them appart from mouse and keyboard. If, for
+ influences them apart from mouse and keyboard. If, for
example, the current page of the main pane changes, then call
this method at the CurrentMasterPagesSelector to select the
previews of the master pages that are assigned to the new
@@ -187,14 +187,14 @@ protected:
ItemList maLockedMasterPages;
/** Lock master pages in the given list and release locks that where
- previously aquired.
+ previously acquired.
*/
void UpdateLocks (const ItemList& rItemList);
void Fill (void);
virtual void Fill (ItemList& rItemList) = 0;
- /** Give derived classes the oportunity to provide their own context
+ /** Give derived classes the opportunity to provide their own context
menu. If they do then they probably have to provide their own
Execute() and GetState() methods as well.
*/
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 928f1d10f3a7..da82e5196cf0 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -32,7 +32,7 @@ namespace sd {
leads to a crash.
During a restart a possibly installed presenter extension is given the
- oportunity to show or hide depending on the number of available displays.
+ opportunity to show or hide depending on the number of available displays.
*/
class SlideShowRestarter
: public boost::enable_shared_from_this<SlideShowRestarter>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index ce7c5506f2a0..de55c65aa061 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1001,7 +1001,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
getViewFrame()->SetChildWindow( SID_NAVIGATOR, maPresSettings.mbStartWithNavigator );
}
- // these Slots are forbiden in other views for this document
+ // these Slots are forbidden in other views for this document
if( mpDocSh )
{
mpDocSh->SetSlotFilter( true, sizeof( pAllowed ) / sizeof( sal_uInt16 ), pAllowed );
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index e2d10e381e65..71d7e31d3fd1 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -92,7 +92,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/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index aa03c4a91674..2e17aeca03a5 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -150,7 +150,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/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 8d51190da1d9..5024a7d5b304 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -749,7 +749,7 @@ void SelectionFunction::MouseDragged (
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);
@@ -1801,7 +1801,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/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
index 868c6eefae8e..ebf2fe97dc74 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
@@ -209,7 +209,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 bd8f7f1f94c0..0ef877f96d39 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -141,7 +141,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/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index 438b1cfea54e..6add4e70bf4e 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -73,7 +73,7 @@ public:
::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter (void) const;
/** 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.
@@ -87,7 +87,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/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 58a8c4321c8b..71846823fe05 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);
@@ -257,7 +257,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/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index 889eba321bdd..8e21db98f798 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -210,7 +210,7 @@ void FormShellManager::UnregisterAtCenterPane (void)
IMPL_LINK_NOARG(FormShellManager, FormControlActivated)
{
- // The form shell has been actived. To give it priority in reacting to
+ // The form shell has been activated. To give it priority in reacting to
// slot calls the form shell is moved to the top of the object bar shell
// stack.
ViewShell* pShell = mrBase.GetMainViewShell().get();
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index eaa950385de2..28e272e229e4 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1030,7 +1030,7 @@ void ViewShell::SetDefTabHRuler( sal_uInt16 nDefTab )
/** Tell the FmFormShell that the view shell is closing. Give it the
- oportunity to prevent that.
+ opportunity to prevent that.
*/
bool ViewShell::PrepareClose (bool bUI)
{