diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2016-10-02 00:24:51 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-03 06:15:59 +0000 |
commit | 14d096e2bf7998de55350b8fe53ec511dedcc477 (patch) | |
tree | d542c6496db0b99c7377236ce89edaed9d854bcf | |
parent | add more dumpAsXml() (diff) | |
download | core-14d096e2bf7998de55350b8fe53ec511dedcc477.tar.gz core-14d096e2bf7998de55350b8fe53ec511dedcc477.zip |
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>
-rw-r--r-- | sw/source/filter/xml/xmlimpit.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/bookmark.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/cctrl/swlbox.cxx | 2 | ||||
-rw-r--r-- | ucbhelper/source/client/interceptedinteraction.cxx | 2 | ||||
-rw-r--r-- | unoidl/source/sourceprovider-parser.y | 2 | ||||
-rw-r--r-- | vcl/opengl/combinedVertexShader.glsl | 2 | ||||
-rw-r--r-- | vcl/opengl/lineVertexShader.glsl | 2 | ||||
-rw-r--r-- | vcl/source/window/event.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/menu.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 2 | ||||
-rw-r--r-- | vcl/win/gdi/salfont.cxx | 2 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/agenda/AgendaDocument.py | 2 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/ui/DocumentPreview.py | 4 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/web/Process.py | 2 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/web/TOCPreview.py | 2 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/web/WWD_Events.py | 4 |
20 files changed, 24 insertions, 24 deletions
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 83ad34465c82..bb0f51e7b596 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -108,7 +108,7 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet, SfxItemState eState = rSet.GetItemState( pEntry->nWhichId, true, &pItem ); - // if its not set, try the pool + // if it's not set, try the pool if (SfxItemState::SET != eState && SfxItemPool::IsWhich(pEntry->nWhichId)) pItem = &rSet.GetPool()->GetDefaultItem(pEntry->nWhichId); diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 0bf9fca7c36a..6197c4f64ef3 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -80,7 +80,7 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, ModifyHdl, Edit&, void) nEntries++; } - // allow to add new bookmark only if one name provided and its not taken + // allow to add new bookmark only if one name provided and it's not taken m_pInsertBtn->Enable(nEntries == 1 && nSelectedEntries == 0); // allow to delete only if all bookmarks are recognized diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 0b8196c16eb9..4f2a5ee6f7c1 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -639,7 +639,7 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CancelHdl, void*, void) uno::Reference<beans::XPropertySet> xPropSet(pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY); if (xPropSet.is() && m_bDestroyMMToolbarOnCancel) { - // hide mailmerge toolbar if it hasnt been there before + // hide mailmerge toolbar if it hasn't been there before uno::Reference<frame::XLayoutManager> xLayoutManager; uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; diff --git a/sw/source/uibase/cctrl/swlbox.cxx b/sw/source/uibase/cctrl/swlbox.cxx index 9ee1e32f8aad..6db094e00d13 100644 --- a/sw/source/uibase/cctrl/swlbox.cxx +++ b/sw/source/uibase/cctrl/swlbox.cxx @@ -78,7 +78,7 @@ void SwComboBox::RemoveEntryAt(sal_Int32 const nPos) ComboBox::RemoveEntryAt(nPos); // Don't add new entries to the list - // add to DelEntryLst + // add to DelEntryList m_DelEntryList.push_back(m_EntryList[nPos]); m_EntryList.erase(m_EntryList.begin() + nPos); } diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx index a03d6dcf8ef4..2ed226e0c30e 100644 --- a/ucbhelper/source/client/interceptedinteraction.cxx +++ b/ucbhelper/source/client/interceptedinteraction.cxx @@ -119,7 +119,7 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep // intercepted ... // Call they might existing derived class, so they can handle that by its own. - // If its not interested on that (may be its not overwritten and the default implementation + // If it's not interested on that (maybe it's not overwritten and the default implementation // returns E_NOT_INTERCEPTED as default) -> break this loop and search for the right continuation. if (bMatch) { diff --git a/unoidl/source/sourceprovider-parser.y b/unoidl/source/sourceprovider-parser.y index 27c4452e8491..332df8947a1c 100644 --- a/unoidl/source/sourceprovider-parser.y +++ b/unoidl/source/sourceprovider-parser.y @@ -770,7 +770,7 @@ Found findEntity( unoidl::PolymorphicStructTypeTemplateEntity *>( e->entity.get()) ->getTypeParameters().size()) - + " type paramters")); + + " type parameters")); return FOUND_ERROR; } t = unoidl::detail::SourceProviderType(n, e, args); 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 diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py index 3802732fb0c1..e623e8617bdb 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py @@ -667,7 +667,7 @@ class ItemsTable(object): it means this is the end of the table, so we end here. (because after getting the cellName above, I call the goRight method. - If it did not go right, it means its the last cell. + If it did not go right, it means it's the last cell. ''' if cellName == cursor.RangeName: diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.py b/wizards/com/sun/star/wizards/ui/DocumentPreview.py index 4c6aed5f054d..92c4444d1e02 100644 --- a/wizards/com/sun/star/wizards/ui/DocumentPreview.py +++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.py @@ -72,9 +72,9 @@ class DocumentPreview(object): which is not part of the global frame tree. Attention: - a) This frame wont be destroyed by the office. It must be closed by you! + a) This frame won't be destroyed by the office. It must be closed by you! Do so - please call XCloseable::close(). - b) The container window is part of the frame. Dont hold it alive - nor try to kill it. + b) The container window is part of the frame. Don't hold it alive - nor try to kill it. It will be destroyed inside close(). ''' diff --git a/wizards/com/sun/star/wizards/web/Process.py b/wizards/com/sun/star/wizards/web/Process.py index a3c76f98b56b..37aa03e1c1ec 100644 --- a/wizards/com/sun/star/wizards/web/Process.py +++ b/wizards/com/sun/star/wizards/web/Process.py @@ -586,7 +586,7 @@ class Process(ProcessErrors): # searches the an exporter for the given CGExporter object # in the cache. - # If its not there, creates it, stores it in the cache and + # If it's not there, creates it, stores it in the cache and # returns it. # @param export specifies the needed exporter. # @return an Exporter instance diff --git a/wizards/com/sun/star/wizards/web/TOCPreview.py b/wizards/com/sun/star/wizards/web/TOCPreview.py index 0cde1b4bd307..339a796eb16a 100644 --- a/wizards/com/sun/star/wizards/web/TOCPreview.py +++ b/wizards/com/sun/star/wizards/web/TOCPreview.py @@ -31,7 +31,7 @@ from ..common.UCB import UCB # while other change according to user choices) # I divide this tasks to two: all necessary # static files, which should not regularly update are copied upon -# instanciation. +# instantiation. # The TOC is generated in refresh(...); class TOCPreview: diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py b/wizards/com/sun/star/wizards/web/WWD_Events.py index 51871eb95cf8..64875c64c7e4 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Events.py +++ b/wizards/com/sun/star/wizards/web/WWD_Events.py @@ -341,7 +341,7 @@ class WWD_Events(WWD_Startup): self.setEnabled(self.btnBackgrounds, True) ''' - invoked when the BackgorundsDialog is "OKed". + invoked when the BackgroundsDialog is "OKed". ''' def setBackground(self, background): @@ -903,7 +903,7 @@ class WWD_Events(WWD_Startup): ''' Here i go through each file, and validate it. - If its ok, I add it to the ListModel/ConfigSet + If it's ok, I add it to the ListModel/ConfigSet ''' for i in range(0, len(self.files)): |