diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2017-03-02 12:26:19 +0100 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-03 06:57:58 +0000 |
commit | 34e1739d56411c81359e24dce500cb54bba6c092 (patch) | |
tree | 6118d095d61d6744f8380bdbf4338cd709f5b54b | |
parent | bcb402298f653146af672ecfca2381062d78c6f2 (diff) |
Fix typos
Change-Id: Ieb35517ba57ca62526e84f6b6cee4c9129b4380a
Reviewed-on: https://gerrit.libreoffice.org/34805
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
17 files changed, 24 insertions, 24 deletions
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index c4221cc06b09..8cf548714ab1 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -158,7 +158,7 @@ class Job : public ::cppu::WeakImplHelper< indicates in which state the internal job currently exist. We can use this information to throw any suitable veto exception - to prevent the environment against dying or suppress superflous dispose() + to prevent the environment against dying or suppress superfluous dispose() calls at the job. */ ERunState m_eRunState; diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 617882c9aa19..68291bea7a26 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -68,7 +68,7 @@ struct ImageListItemDescriptor ImageMaskMode nMaskMode; // an enum to describe the current mask mode std::unique_ptr<ImageItemListDescriptor> pImageItemList; // an array of ImageItemDescriptors that describes every image - OUString aHighContrastURL; // an URL to an optional high contrast bitmap with serveral images inside + OUString aHighContrastURL; // an URL to an optional high contrast bitmap with several images inside OUString aHighContrastMaskURL; // an URL to an optional high contrast bitmap as a mask }; diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java index 6b3317dc79b1..f7109c1bf538 100644 --- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java @@ -106,7 +106,7 @@ public class CheckContextMenuInterceptor { System.out.println(" **** Context Menu Interceptor *** "); - // intialize the test document + // initialize the test document xDrawDoc = DrawTools.createDrawDoc(xMSF); SOfficeFactory SOF = SOfficeFactory.getFactory(xMSF); diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java index eb0060d07f7a..fdf2259c2f88 100644 --- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java @@ -60,7 +60,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor com.sun.star.container.XIndexContainer xSubMenuContainer = UnoRuntime.queryInterface(com.sun.star.container.XIndexContainer.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerContainer")); - // intialize root menu entry "Help" + // initialize root menu entry "Help" xRootMenuEntry.setPropertyValue("Text", "Help"); xRootMenuEntry.setPropertyValue("CommandURL", "slot:5410"); xRootMenuEntry.setPropertyValue("HelpURL", "5410"); @@ -68,7 +68,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor xRootMenuEntry.setPropertyValue("Image", myBitmap); // create menu entries for the new sub menu - // intialize help/content menu entry + // initialize help/content menu entry // entry "Content" XPropertySet xMenuEntry = UnoRuntime.queryInterface(XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger")); xMenuEntry.setPropertyValue("Text", "Content"); @@ -78,7 +78,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor // insert menu entry to sub menu xSubMenuContainer.insertByIndex(0, xMenuEntry); - // intialize help/help on help + // initialize help/help on help // entry "Help on Help" xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger")); xMenuEntry.setPropertyValue("Text", "Help on Help"); @@ -87,7 +87,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor // insert menu entry to sub menu xSubMenuContainer.insertByIndex(1, xMenuEntry); - // intialize help/tips + // initialize help/tips // entry "Tips" xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger")); xMenuEntry.setPropertyValue("Text", "Tips"); diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java index a272f8570a4b..07508ef3f94c 100644 --- a/framework/qa/complex/imageManager/_XInitialization.java +++ b/framework/qa/complex/imageManager/_XInitialization.java @@ -31,7 +31,7 @@ import lib.TestParameters; * <ul> * <li> <code>'XInitialization.args'</code> (of type <code>Object[]</code>): * (<b>Optional</b>) : argument for <code>initialize</code> -* method. If ommitted, zero length array is used. </li> +* method. If omitted, zero length array is used. </li> * <ul> <p> * Test is multithread compliant. <p> * Till the present time there was no need to recreate environment diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 0c306fbc81d0..6b0e75583ef9 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -163,7 +163,7 @@ void DocumentAcceleratorConfiguration::fillCache() // get current office locale ... but don't cache it. // Otherwise we must be listener on the configuration layer - // which seems to superflous for this small implementation .-) + // which seems to superfluous for this small implementation .-) LanguageTag aLanguageTag( impl_ts_getLocale()); // May be the current document does not contain any diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index d8d1f859ceb7..08e861f0778b 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -90,7 +90,7 @@ void GlobalAcceleratorConfiguration::fillCache() #if 0 // get current office locale ... but don't cache it. // Otherwise we must be listener on the configuration layer - // which seems to superflous for this small implementation .-) + // which seems to superfluous for this small implementation .-) // XXX: what is this good for? it was a comphelper::Locale but unused LanguageTag aLanguageTag(m_sLocale); #endif diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index ea4c5f3098c4..b236ba1cc6d6 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -125,7 +125,7 @@ void ModuleAcceleratorConfiguration::fillCache() #if 0 // get current office locale ... but don't cache it. // Otherwise we must be listener on the configuration layer - // which seems to superflous for this small implementation .-) + // which seems to superfluous for this small implementation .-) // XXX: what is this good for? it was a comphelper::Locale but unused LanguageTag aLanguageTag(m_sLocale); #endif diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index f368878e5d98..bf7459c94ee3 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -198,7 +198,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt // I.III) "_self", "", "_top" // The desktop can't load any document - but he can handle some special protocols like "uno", "slot" ... - // Why is "top" here handled too? Because the desktop is the topest frame. Normally it's superflous + // Why is "top" here handled too? Because the desktop is the topest frame. Normally it's superfluous // to use this target - but we can handle it in the same manner then "_self". else if ( diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index a9025aaef71b..56f6ea40b22d 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -125,7 +125,7 @@ bool RequestFilterSelect_Impl::isAbort() const } // return user selected filter -// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! +// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these only! OUString RequestFilterSelect_Impl::getFilter() const { @@ -168,7 +168,7 @@ bool RequestFilterSelect::isAbort() const } // return user selected filter -// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! +// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these only! OUString RequestFilterSelect::getFilter() const { diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 6453aa7b5eaf..2772efd9a11b 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -132,7 +132,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int // We think about right implementation. SAL_WARN_IF( (nSearchFlags & FrameSearchFlag::AUTO), "fwk", "OFrames::queryFrames(): Search with AUTO-flag is not supported yet!" ); - // Search for ALL and GLOBAL is superflous! + // Search for ALL and GLOBAL is superfluous! // We support all necessary flags, from which these two flags are derived. // ALL = PARENT + SELF + CHILDREN + SIBLINGS // GLOBAL = ALL + TASKS @@ -345,7 +345,7 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFram -----------------------------------------------------------------------------------------------------------------*/ // A search for frames must initiate with right flags. -// Some one are superflous and not supported yet. But here we control only the range of incoming parameter! +// Some one are superfluous and not supported yet. But here we control only the range of incoming parameter! bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) { // Set default return value. diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index ba65abce5212..2fbade1479b2 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -92,7 +92,7 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont } /** - @short superflous! + @short superfluous! @descr Releasing of memory and reference must be done inside die() call. Otherwhise it's a bug. */ diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index c01142a14b6c..fe05bbe9832a 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2249,7 +2249,7 @@ void AutoRecovery::implts_updateTimer() osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); if ( - (m_eJob == AutoRecovery::E_NO_JOB ) || // TODO may be superflous - E_DONT_START_TIMER should be used only + (m_eJob == AutoRecovery::E_NO_JOB ) || // TODO may be superfluous - E_DONT_START_TIMER should be used only (m_eTimerType == AutoRecovery::E_DONT_START_TIMER) ) return; diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index d77774cc7308..cf69e256bc29 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -801,7 +801,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& // <- SAFE ---------------------------------- // Start listening for events after setting it on helper class ... - // So superflous messages are filtered to NULL :-) + // So superfluous messages are filtered to NULL :-) implts_startWindowListening(); m_pWindowCommandDispatch = new WindowCommandDispatch(m_xContext, this); @@ -1143,7 +1143,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // II.III.II) PARENT // Forward search to our parent (if he exists.) - // To prevent us against recursive and superflous calls (which can occur if we allow him + // To prevent us against recursive and superfluous calls (which can occur if we allow him // to search on his children too) we must change used search flags. if ( @@ -2072,7 +2072,7 @@ void SAL_CALL Frame::disposing() SAL_INFO("fwk.frame", "[Frame] " << m_sName << " send dispose event to listener"); // First operation should be ... "stopp all listening for window events on our container window". - // These events are superflous but can make trouble! + // These events are superfluous but can make trouble! // We will die, die and die ... implts_stopWindowListening(); diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index b33049e2fcd6..89ebd484886e 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -46,7 +46,7 @@ namespace framework { // Wrapper class to notify controller about events from ListBox. -// Unfortunaltly the events are notifed through virtual methods instead +// Unfortunaltly the events are notified through virtual methods instead // of Listeners. class ListBoxControl : public ListBox diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index c5dce26b90ed..c82b5dfbb7c1 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -45,7 +45,7 @@ namespace framework { // Wrapper class to notify controller about events from edit. -// Unfortunaltly the events are notifed through virtual methods instead +// Unfortunaltly the events are notified through virtual methods instead // of Listeners. class EditControl : public Edit diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 7b3750797712..25c3f223b339 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -50,7 +50,7 @@ namespace framework { // Wrapper class to notify controller about events from combobox. -// Unfortunaltly the events are notifed through virtual methods instead +// Unfortunaltly the events are notified through virtual methods instead // of Listeners. class SpinfieldControl : public SpinField |