summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2016-10-02 00:24:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-03 06:15:59 +0000
commit14d096e2bf7998de55350b8fe53ec511dedcc477 (patch)
treed542c6496db0b99c7377236ce89edaed9d854bcf /vcl
parentba3521f28831f41c92aa863ba6ba6da7c91c56f7 (diff)
Fix typos
Change-Id: Ie75beb4e282a4d1b784a5847262e39cf9c851527 Reviewed-on: https://gerrit.libreoffice.org/29440 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/opengl/combinedVertexShader.glsl2
-rw-r--r--vcl/opengl/lineVertexShader.glsl2
-rw-r--r--vcl/source/window/event.cxx4
-rw-r--r--vcl/source/window/menu.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx2
-rw-r--r--vcl/unx/gtk/gtksalmenu.cxx4
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx2
-rw-r--r--vcl/win/gdi/salfont.cxx2
9 files changed, 11 insertions, 11 deletions
diff --git a/vcl/opengl/combinedVertexShader.glsl b/vcl/opengl/combinedVertexShader.glsl
index 518221fb5bd1..b040ca2abe81 100644
--- a/vcl/opengl/combinedVertexShader.glsl
+++ b/vcl/opengl/combinedVertexShader.glsl
@@ -40,7 +40,7 @@ void main()
if (type == TYPE_LINE)
{
- // miter factor to additionaly lenghten the distance of vertex (needed for miter)
+ // miter factor to additionally lenghten the distance of vertex (needed for miter)
// if 1.0 - miter_factor has no effect
float miter_factor = 1.0 / abs(extrusion_vectors.z);
// fade factor is always -1.0 or 1.0 -> we transport that info together with length
diff --git a/vcl/opengl/lineVertexShader.glsl b/vcl/opengl/lineVertexShader.glsl
index 0adcb4908201..90939a974689 100644
--- a/vcl/opengl/lineVertexShader.glsl
+++ b/vcl/opengl/lineVertexShader.glsl
@@ -20,7 +20,7 @@ uniform mat4 mvp;
void main()
{
vec2 extrusion_vector = extrusion_vectors.xy;
- // miter factor to additionaly lenghten the distance of vertex (needed for miter)
+ // miter factor to additionally lenghten the distance of vertex (needed for miter)
// if 1.0 - miter_factor has no effect
float miter_factor = 1.0f / abs(extrusion_vectors.z);
// fade factor is always -1.0 or 1.0 -> we transport that info together with length
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index ddb5a9168b88..5f145c7875dd 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -359,7 +359,7 @@ void Window::RemoveUserEvent( ImplSVEvent * nUserEvent )
static MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, vcl::Window* pSource, vcl::Window* pDest )
{
- // the mouse event occured in a different window, we need to translate the coordinates of
+ // the mouse event occurred in a different window, we need to translate the coordinates of
// the mouse cursor within that (source) window to the coordinates the mouse cursor would
// be in the destination window
Point aPos = pSource->OutputToScreenPixel( rE.GetPosPixel() );
@@ -390,7 +390,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
}
else
{
- // the mouse event occured in a different window, we need to translate the coordinates of
+ // the mouse event occurred in a different window, we need to translate the coordinates of
// the mouse cursor within that window to the coordinates the mouse cursor would be in the
// current window
vcl::Window* pSource = rNEvt.GetWindow();
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 4fca3158e4ea..7b99f2a4597e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2554,7 +2554,7 @@ bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent )
{
// Except when the event is the F6 cycle pane event and we can put our
// focus into it (i.e. the gtk3 menubar case but not the mac/unity case
- // where its not part of the application window)
+ // where it's not part of the application window)
if (!TaskPaneList::IsCycleKey(rKEvent.GetKeyCode()))
return false;
if (!pNativeMenu->CanGetFocus())
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 491d6295171a..29f0b4e89887 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -3046,7 +3046,7 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
// pressing just the ctrl key leads to a keysym of XK_Control but
// the event state does not contain ControlMask. In the release
- // event its the other way round: it does contain the Control mask.
+ // event it's the other way round: it does contain the Control mask.
// The modifier mode therefore has to be adapted manually.
sal_uInt16 nExtModMask = 0;
sal_uInt16 nModMask = 0;
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 529128ec68d6..d83ebe48e7a6 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -3119,7 +3119,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame
sal_uInt16 nModMask = 0;
// pressing just the ctrl key leads to a keysym of XK_Control but
// the event state does not contain ControlMask. In the release
- // event its the other way round: it does contain the Control mask.
+ // event it's the other way round: it does contain the Control mask.
// The modifier mode therefore has to be adapted manually.
switch( pEvent->keyval )
{
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 9e4547b35acb..6a9ac73175af 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -312,7 +312,7 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries)
void GtkSalMenu::Update()
{
- //find out if top level is a menubar or not, if not, then its a popup menu
+ //find out if top level is a menubar or not, if not, then it's a popup menu
//hierarchy and in those we hide (most) disabled entries
const GtkSalMenu* pMenu = this;
while (pMenu->mpParentSalMenu)
@@ -972,7 +972,7 @@ bool GtkSalMenu::NativeSetItemCommand( unsigned nSection,
bSubMenuAddedOrRemoved = bOldHasSubmenu != bIsSubmenu;
if (bSubMenuAddedOrRemoved)
{
- //tdf#98636 its not good enough to unset the "submenu-action" attribute to change something
+ //tdf#98636 it's not good enough to unset the "submenu-action" attribute to change something
//from a submenu to a non-submenu item, so remove the old one entirely and re-add it to
//support achieving that
gchar* pLabel = g_lo_menu_get_label_from_item_in_section(pMenu, nSection, nItemPos);
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 3d3fc9e24105..5d4b92b0f11a 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3007,7 +3007,7 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget, GdkEventKey* pEvent, gpointe
sal_uInt16 nModMask = 0;
// pressing just the ctrl key leads to a keysym of XK_Control but
// the event state does not contain ControlMask. In the release
- // event its the other way round: it does contain the Control mask.
+ // event it's the other way round: it does contain the Control mask.
// The modifier mode therefore has to be adapted manually.
switch( pEvent->keyval )
{
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index a923c2b97705..ee3ea8342853 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -177,7 +177,7 @@ static Unicode2LangType aLangFromCodeChart[]= {
// {0x1200, 0x139F, LANGUAGE_AMHARIC_ETHIOPIA}, // Ethiopic
// {0x1200, 0x139F, LANGUAGE_TIGRIGNA_ETHIOPIA}, // Ethiopic
{0x13A0, 0x13FF, LANGUAGE_CHEROKEE_UNITED_STATES}, // Cherokee
-// {0x1400, 0x167F, LANGUAGE_CANADIAN_ABORIGINAL}, // Canadian Aboriginial Syllabics
+// {0x1400, 0x167F, LANGUAGE_CANADIAN_ABORIGINAL}, // Canadian Aboriginal Syllabics
// {0x1680, 0x169F, LANGUAGE_OGHAM}, // Ogham
// {0x16A0, 0x16F0, LANGUAGE_RUNIC}, // Runic
// {0x1700, 0x171F, LANGUAGE_TAGALOG}, // Tagalog