diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-05-10 09:34:10 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-10 14:50:59 +0200 |
commit | fbc038cc4f4a12f8302ce5b3bd7d739bd66a674e (patch) | |
tree | d6cc189748e5980420cc0611b44b28ec4183ea25 /extensions/source | |
parent | 8ccffe4e7fb6abf6fa3ba9187007e9d8af116baf (diff) |
an uno -> a uno
Change-Id: I538db88f8477dd2d2ad25c372928fec6c11d979d
Reviewed-on: https://gerrit.libreoffice.org/72105
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.hxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/oleobjw.cxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/oleobjw.hxx | 4 | ||||
-rw-r--r-- | extensions/source/ole/servprov.hxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/unoconversionutilities.hxx | 12 | ||||
-rw-r--r-- | extensions/source/ole/unoobjw.cxx | 8 | ||||
-rw-r--r-- | extensions/source/ole/unotypewrapper.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/eventhandler.cxx | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 5a73f5ac6b04..f5037915bdf2 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -90,7 +90,7 @@ namespace abp /** a non-UNO wrapper for a data source <p>This class allows to access data sources without the need to compile the respective file with exception handling enabled (hopefully :).</p> - <p>In addition to wrapping an UNO data source, an instance of this class can handle at most + <p>In addition to wrapping a UNO data source, an instance of this class can handle at most one valid connection, as obtained from the data source.</p> */ class ODataSource diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 76d6d246f377..0d895b2ffbca 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -446,7 +446,7 @@ Any SAL_CALL IUnknownWrapper::getValue( const OUString& aPropertyName ) // I was going to implement an XServiceInfo interface to allow the type // of the automation object to be exposed.. but it seems // from looking at comments in the code that it is possible for - // this object to actually wrap an UNO object ( I guess if automation is + // this object to actually wrap a UNO object ( I guess if automation is // used from MSO to create Openoffice objects ) Therefore, those objects // will more than likely already have their own XServiceInfo interface. // Instead here I chose a name that should be illegal both in COM and diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 1ba5b8a5ebbf..8bba811ff801 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -51,7 +51,7 @@ typedef std::unordered_map<OUString, pair<DISPID, unsigned short>> DispIdMap; typedef std::unordered_multimap<OUString, unsigned int> TLBFuncIndexMap; // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object. -// If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component. +// If m_TypeDescription is set then this class represents a UNO interface implemented in a COM component. // The interface is not a real interface in terms of an abstract class but is realized through IDispatch. class IUnknownWrapper : public WeakImplHelper< XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >, @@ -214,7 +214,7 @@ protected: // wrapper class knows what type it is represting. The member m_TypeDescription holds this // information. // m_TypeDescription is only useful when an object wraps an IDispatch object that implements - // an UNO interface. The value is set during a call to XInitialization::initialize. + // a UNO interface. The value is set during a call to XInitialization::initialize. Sequence<Type> m_seqTypes; CComPtr<IUnknown> m_spUnknown; CComPtr<IDispatch> m_spDispatch; diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx index 4bd762cc3c54..f8b1704b8339 100644 --- a/extensions/source/ole/servprov.hxx +++ b/extensions/source/ole/servprov.hxx @@ -86,7 +86,7 @@ protected: // This class realizes the service com.sun.star.bridge.OleBridgeSupplier2 and // com.sun.star.bridge.OleBridgeSupplierVar1. The class implements XBridgeSupplier2 which // interface does not need a Maschine Id in its createBridge function anymore, -// If an UNO interface is to be converted then the member m_nUnoWrapperClass determines +// If a UNO interface is to be converted then the member m_nUnoWrapperClass determines // what wrapper class is to be used. There are currently InterfaceOleWrapper and // UnoObjectWrapperRemoteOpt. The first is used for the OleBridgeSupplier2 and the // latter for OleBridgeSupplierVar1. diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index b987a439b70b..f211d4dbf3fa 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -71,7 +71,7 @@ extern std::unordered_map<sal_uIntPtr, WeakReference<XInterface> > ComPtrToWrapp // Maps XInterface pointers to a weak reference of its wrapper class (i.e. // InterfaceOleWrapper). It is the responsibility of the wrapper to remove the entry when -// it is being destroyed. It is used to ensure the identity of objects. That is, an UNO interface +// it is being destroyed. It is used to ensure the identity of objects. That is, a UNO interface // is mapped to IDispatch which is kept alive in the COM environment. If the same // UNO interface is mapped again to COM then the IDispach of the first mapped instance // must be returned. @@ -1609,10 +1609,10 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny } } -// The function converts an IUnknown* into an UNO interface or struct. The +// The function converts an IUnknown* into a UNO interface or struct. The // IUnknown pointer can constitute different kind of objects: -// 1. a wrapper of an UNO struct (the wrapper was created by this bridge) -// 2. a wrapper of an UNO interface (created by this bridge) +// 1. a wrapper of a UNO struct (the wrapper was created by this bridge) +// 2. a wrapper of a UNO interface (created by this bridge) // 3. a dispatch object that implements UNO interfaces // 4. a dispatch object. @@ -1629,7 +1629,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny // SUPPORTED_INTERFACES_PROP, then the INTERFACE_ADAPTER_FACTORY creates an object that // implements all these interfaces. // This is only done if "pUnknown" is not already a UNO wrapper, -// that is it is actually NOT an UNO object that was converted to a COM object. If it is an +// that is it is actually NOT a UNO object that was converted to a COM object. If it is an // UNO wrapper than the original UNO object is being extracted, queried for "aType" (if // it is no struct) and returned. template<class T> @@ -1695,7 +1695,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& } - // Check if "spUnknown" is a UNO wrapper, that is an UNO object that has been + // Check if "spUnknown" is a UNO wrapper, that is a UNO object that has been // passed to COM. Then it supports IUnoObjectWrapper // and we extract the original UNO object. CComQIPtr<IUnoObjectWrapper> spUno( spUnknown); diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index e6730d75eee9..dfcf493d00b5 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -1263,9 +1263,9 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/, // A JScriptValue (ValueObject) object is a COM object in that it implements IDispatch and the // IJScriptValue object interface. Such objects are provided by all UNO wrapper // objects used within a JScript script. To obtain an instance one has to call -// "_GetValueObject() or Bridge_GetValueObject()" on an UNO wrapper object (class InterfaceOleWrapper). +// "_GetValueObject() or Bridge_GetValueObject()" on a UNO wrapper object (class InterfaceOleWrapper). // A value object is appropriately initialized within the script and passed as -// parameter to an UNO object method or property. The convertDispparamsArgs function +// parameter to a UNO object method or property. The convertDispparamsArgs function // can easily find out that a param is such an object by querying for the // IJScriptValue interface. By this interface one the type and kind ( out, in/out) // can be determined and the right conversion can be applied. @@ -1517,11 +1517,11 @@ void SAL_CALL InterfaceOleWrapper::initialize( const Sequence< Any >& aArguments { switch( aArguments.getLength() ) { - case 2: // the object wraps an UNO struct + case 2: // the object wraps a UNO struct aArguments[0] >>= m_xInvocation; aArguments[1] >>= m_defaultValueType; break; - case 3: // the object wraps an UNO interface + case 3: // the object wraps a UNO interface aArguments[0] >>= m_xInvocation; aArguments[1] >>= m_xOrigin; aArguments[2] >>= m_defaultValueType; diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx index 4414a654b6bb..89e3dea432c3 100644 --- a/extensions/source/ole/unotypewrapper.hxx +++ b/extensions/source/ole/unotypewrapper.hxx @@ -23,7 +23,7 @@ #include "comifaces.hxx" -/* creates an UnoTypWrapper and sets the Name property to the value +/* creates a UnoTypWrapper and sets the Name property to the value specified by sTypeName. Returns true if the object could be created and initialized. */ diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 45a1ce2f7539..65191db05240 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -298,7 +298,7 @@ namespace pcr typedef ::cppu::WeakImplHelper < css::container::XNameReplace > EventHolder_Base; - /* An UNO component holding assigned event descriptions, for use with a SvxMacroAssignDlg */ + /* A UNO component holding assigned event descriptions, for use with a SvxMacroAssignDlg */ class EventHolder : public EventHolder_Base { private: |