summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2013-12-20 11:25:37 +0100
committerAndras Timar <andras.timar@collabora.com>2013-12-20 15:55:00 +0100
commitb55259eeb549482477c57d854f3de72aff345edb (patch)
tree35e474b8458ae776a8455f4f78e73ae28c611180 /sd
parent377ec698afc98a9a098b456f4ae3c694498df6a2 (diff)
typo fixes
Change-Id: Ia5f104bfd707bcf4e159c78ca2764c861fb0b6d9
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/sdpage.cxx2
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx4
-rw-r--r--sd/source/ui/annotations/annotationwindow.hxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationController.cxx2
-rw-r--r--sd/source/ui/func/fudraw.cxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.hxx2
6 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 5c135ac965a5..16ed58e6dbbc 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2727,7 +2727,7 @@ void SdPage::setHeaderFooterSettings( const sd::HeaderFooterSettings& rNewSettin
// #i119056# For HeaderFooterSettings SdrObjects are used, but the properties
// used are not part of their model data, but kept in SD. This data is applied
// using a 'backdoor' on primitive creation. Thus, the normal mechanism to detect
- // object changes does not work here. It is neccessary to trigger updates here
+ // object changes does not work here. It is necessary to trigger updates here
// directly. BroadcastObjectChange used for PagePreview invalidations,
// flushViewObjectContacts used to invalidate and flush all visualizations in
// edit views.
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 0c8fb7c14ef5..564c5c6f853c 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -175,7 +175,7 @@ void AnnotationTextWindow::KeyInput( const KeyEvent& rKeyEvt )
}
if (bDone)
{
- mpAnnotationWindow->ResizeIfNeccessary(aOldHeight,mpAnnotationWindow->GetPostItTextHeight());
+ mpAnnotationWindow->ResizeIfNecessary(aOldHeight,mpAnnotationWindow->GetPostItTextHeight());
}
else
{
@@ -449,7 +449,7 @@ void AnnotationWindow::SetScrollbar()
mpVScrollbar->SetThumbPos( mpOutlinerView->GetVisArea().Top()+ mpOutlinerView->GetEditView().GetCursor()->GetOffsetY());
}
-void AnnotationWindow::ResizeIfNeccessary(long aOldHeight, long aNewHeight)
+void AnnotationWindow::ResizeIfNecessary(long aOldHeight, long aNewHeight)
{
if (aOldHeight != aNewHeight)
{
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 9d43f3576f0e..387686c11ddb 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -125,7 +125,7 @@ class AnnotationWindow : public FloatingWindow
void InitControls();
void HidePostIt();
void DoResize();
- void ResizeIfNeccessary(long aOldHeight, long aNewHeight);
+ void ResizeIfNecessary(long aOldHeight, long aNewHeight);
void SetScrollbar();
void Rescale();
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 50c587adaa00..7e0203511e94 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -87,7 +87,7 @@ public:
*/
::boost::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
- /** The requested configuration which is modifed (asynchronously) by
+ /** The requested configuration which is modified (asynchronously) by
calls to requestResourceActivation() and
requestResourceDeactivation(). The mpConfigurationUpdater makes the
current configuration reflect the content of this one.
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d19f9f87f750..19c95a4193c1 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -631,7 +631,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if (bDefPointer)
{
- mpWindow->SetPointer(mpView->GetPreferedPointer(
+ mpWindow->SetPointer(mpView->GetPreferredPointer(
aPnt, mpWindow, nModifier, bLeftDown));
}
}
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index 67b8811bdee4..09ead4f93131 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -42,7 +42,7 @@ class MasterPageDescriptor;
controls. It uses internally a singleton implementation object.
Therefore, all MasterPageContainer object operator on the same set of
master pages. Each MasterPageContainer, however, has its own
- PreviewSize value and thus can independantly switch between large and
+ PreviewSize value and thus can independently switch between large and
small previews.
The container maintains its own document to store master page objects.