summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2017-03-10 18:58:02 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-03-11 05:04:40 +0000
commitfba66b325c493567126b23d481d75ee00dc9c30d (patch)
tree4b8d64cc253aef14a22c5638b5f8175bc0049dcf /framework
parentb4fdb46a75731b22eb85671af4773e5bc9208f85 (diff)
Fix typos
Change-Id: I19d30a1ef4236dbe0a0053dad67a5ba7b1586fc8 Reviewed-on: https://gerrit.libreoffice.org/35054 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Johnny_M <klasse@partyheld.de> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/dispatch/dispatchprovider.hxx2
-rw-r--r--framework/inc/dispatch/popupmenudispatcher.hxx2
-rw-r--r--framework/inc/helper/persistentwindowstate.hxx2
-rw-r--r--framework/inc/interaction/quietinteraction.hxx2
-rw-r--r--framework/inc/macros/xinterface.hxx6
-rw-r--r--framework/inc/recording/dispatchrecordersupplier.hxx2
-rw-r--r--framework/source/dispatch/dispatchprovider.cxx2
-rw-r--r--framework/source/interaction/quietinteraction.cxx4
-rw-r--r--framework/source/services/autorecovery.cxx4
-rw-r--r--framework/source/services/desktop.cxx6
-rw-r--r--framework/source/services/frame.cxx2
11 files changed, 17 insertions, 17 deletions
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index ab00668f55db..185fe8a9fc42 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -63,7 +63,7 @@ enum EDispatchHelper
- a normal frame never can create a new one by himself
@attention Use this class as member only! Never use it as baseclass.
- XInterface will be ambigous and we hold a weakreference to our OWNER - not to our SUPERCLASS!
+ XInterface will be ambiguous and we hold a weakreference to our OWNER - not to our SUPERCLASS!
@base OWeakObject
provides ref count and weak mechanism
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 01cf4a6ca8b7..6b82239c03e4 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -55,7 +55,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
/*-************************************************************************************************************
@short helper for desktop only(!) to create new tasks on demand for dispatches
@descr Use this class as member only! Never use it as baseclass.
- XInterface will be ambigous and we hold a weakcss::uno::Reference to our OWNER - not to our SUPERCLASS!
+ XInterface will be ambiguous and we hold a weakcss::uno::Reference to our OWNER - not to our SUPERCLASS!
@implements XInterface
XDispatch
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index efd6cebfd304..40730a4c6bde 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -140,7 +140,7 @@ class PersistentWindowState : public ::cppu::WeakImplHelper<
@param sModuleName
identifies the application module, where the
- information should be setted on.
+ information should be set on.
@param sWindowState
contains the information about position and size.
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index 04eb5169b459..305a819a7a89 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -60,7 +60,7 @@ class QuietInteraction : public ::cppu::WeakImplHelper<
@interface XInteractionHandler
@short called from outside to handle a problem
@descr The only interaction we can handle here is to
- decide which of two ambigous filters should be really used.
+ decide which of two ambiguous filters should be really used.
We use the user selected one every time.
All other request will be aborted and can break the code,
which use this interaction handler.
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 4a57c3d69f8c..737e5cdadd49 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -35,8 +35,8 @@ namespace framework{
Please use follow public macros only!
1) DEFINE_XINTERFACE => use it in header to declare XInterface and his methods
- 2) DIRECT_INTERFACE( INTERFACE ) => use it as parameter INTERFACEx at 4) if interface not ambigous
- 3) DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) => use it as parameter INTERFACEx at 4) if interface can be ambigous
+ 2) DIRECT_INTERFACE( INTERFACE ) => use it as parameter INTERFACEx at 4) if interface not ambiguous
+ 3) DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) => use it as parameter INTERFACEx at 4) if interface can be ambiguous
4) DECLARE_XINTERFACE_0( CLASS, BASECLASS ) => use it to define implementation of XInterface for 0 additional interface to baseclass
DECLARE_XINTERFACE_1( CLASS, BASECLASS, INTERFACE1 ) => use it to define implementation of XInterface for 1 additional interface to baseclass
...
@@ -120,7 +120,7 @@ ________________________________________________________________________________
static_cast< INTERFACE* >( this )
// Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN'T use an interface directly in queryInterface()!
-// (zB at ambigous errors!)
+// (zB at ambiguous errors!)
#define DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) \
static_cast< BASEINTERFACE* >( static_cast< DERIVEDINTERFACE* >( this ) )
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index 14b02b43ca4d..5942e85aff6e 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -54,7 +54,7 @@ class DispatchRecorderSupplier : public ::cppu::WeakImplHelper<
/** provided dispatch recorder of this supplier instance
- @life Is controlled from outside. Because this variable is setted
+ @life Is controlled from outside. Because this variable is set
from there and not created internally. But we release our
reference to it if we die.
*/
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index bf7459c94ee3..509c6d79c668 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -320,7 +320,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
// I.VI) "_self", ""
// Our owner frame should handle this URL. But we can't do it for all of them.
- // So we ask the internal setted controller first. If he disagree we try to find a registered
+ // So we ask the internal set controller first. If he disagree we try to find a registered
// protocol handler. If this failed too - we check for a loadable content and in case of true
// we load it into the frame by returning specilized dispatch object.
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index 202a9ae18d49..f59c2d1d33aa 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -73,8 +73,8 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI
xFOptions.set( lContinuations[i], css::uno::UNO_QUERY );
}
- // differ between abortable interactions (error, unknown filter ...)
- // and other ones (ambigous but not unknown filter ...)
+ // differ between abortable interactions (error, unknown filter...)
+ // and other ones (ambiguous but not unknown filter...)
css::task::ErrorCodeRequest aErrorCodeRequest;
css::document::LockedDocumentRequest aLockedDocumentRequest;
css::document::FilterOptionsRequest aFilterOptionsRequest;
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index fe05bbe9832a..6d1e84bac1e0 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1323,8 +1323,8 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL&
implts_readAutoSaveConfig();
g.clear();
implts_updateTimer();
- // can it happen that might be the listener was stopped ? .-)
- // make sure it runs always ... even if AutoSave itself was disabled temporarly.
+ // can it happen that might be the listener was stopped? .-)
+ // make sure it runs always... even if AutoSave itself was disabled temporarily.
implts_startListening();
}
else
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index b210434b584c..7463dfc940c1 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1217,7 +1217,7 @@ void SAL_CALL Desktop::disposing( const css::lang::EventObject& )
of our own called method.
@attention a)
- Normal loop in loadComponentFromURL() breaks on setted member m_eLoadState during callback statusChanged().
+ Normal loop in loadComponentFromURL() breaks on set member m_eLoadState during callback statusChanged().
But these interaction feature implements second way to do so! So we must look on different callbacks
for same operation ... and live with it.
b)
@@ -1266,8 +1266,8 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
xFilterSelect.set( lContinuations[nStep], css::uno::UNO_QUERY );
}
- // differ between abortable interactions (error, unknown filter ...)
- // and other ones (ambigous but not unknown filter ...)
+ // differ between abortable interactions (error, unknown filter...)
+ // and other ones (ambiguous but not unknown filter...)
css::task::ErrorCodeRequest aErrorCodeRequest;
if( aRequest >>= aErrorCodeRequest )
{
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index cf69e256bc29..2a8fc36a7fad 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2684,7 +2684,7 @@ void SAL_CALL Frame::setActionLocks( sal_Int16 nLock )
SolarMutexGuard g;
// Attention: If somewhere called resetActionLocks() before and get e.g. 5 locks ...
// and tried to set these 5 ones here after his operations ...
- // we can't ignore setted requests during these two calls!
+ // we can't ignore set requests during these two calls!
// So we must add(!) these 5 locks here.
m_nExternalLockCount = m_nExternalLockCount + nLock;
}