summaryrefslogtreecommitdiff
path: root/extensions/source/ole/unoobjw.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-14 16:55:51 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-16 14:19:16 +0000
commitd11ac6045926d4c6e392b3797939fbb7c7d37b27 (patch)
treeb6b99803b11f8f9d84bba39ee2d38430c4f59c69 /extensions/source/ole/unoobjw.hxx
parent099ef29c47970d4b9d20f31d0ccbef93c492226b (diff)
clang-cl loplugin: extensions
Change-Id: I659d8a3b098c7417235006c86ea60e7fe1e56a44 Reviewed-on: https://gerrit.libreoffice.org/29867 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions/source/ole/unoobjw.hxx')
-rw-r--r--extensions/source/ole/unoobjw.hxx68
1 files changed, 34 insertions, 34 deletions
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index af067eb66db3..170e2f2f9d3a 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -53,7 +53,7 @@ struct hash_IUnknown_Impl
{
size_t operator()(const IUnknown* p) const
{
- return (size_t)p;
+ return reinterpret_cast<size_t>(p);
}
};
@@ -85,7 +85,7 @@ typedef std::unordered_map
typedef std::unordered_map
<
OUString,
- sal_Bool,
+ bool,
OUStringHash
> BadNameMap;
@@ -110,28 +110,28 @@ public:
InterfaceOleWrapper_Impl(Reference<XMultiServiceFactory>& xFactory, sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass);
- ~InterfaceOleWrapper_Impl();
+ ~InterfaceOleWrapper_Impl() override;
/* IUnknown methods */
- STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj);
- STDMETHOD_(ULONG, AddRef)();
- STDMETHOD_(ULONG, Release)();
+ STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
+ STDMETHOD_(ULONG, AddRef)() override;
+ STDMETHOD_(ULONG, Release)() override;
/* IDispatch methods */
- STDMETHOD( GetTypeInfoCount )( unsigned int * pctinfo );
- STDMETHOD( GetTypeInfo )( unsigned int itinfo, LCID lcid, ITypeInfo ** pptinfo );
+ STDMETHOD( GetTypeInfoCount )( unsigned int * pctinfo ) override;
+ STDMETHOD( GetTypeInfo )( unsigned int itinfo, LCID lcid, ITypeInfo ** pptinfo ) override;
STDMETHOD( GetIDsOfNames )( REFIID riid, OLECHAR ** rgszNames, unsigned int cNames,
- LCID lcid, DISPID * rgdispid );
+ LCID lcid, DISPID * rgdispid ) override;
STDMETHOD( Invoke )( DISPID dispidMember, REFIID riid, LCID lcid, unsigned short wFlags,
DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
- unsigned int * puArgErr );
+ unsigned int * puArgErr ) override;
/* IDispatchEx methods */
virtual HRESULT STDMETHODCALLTYPE GetDispID(
/* [in] */ BSTR bstrName,
/* [in] */ DWORD grfdex,
- /* [out] */ DISPID __RPC_FAR *pid);
+ /* [out] */ DISPID __RPC_FAR *pid) override;
virtual /* [local] */ HRESULT STDMETHODCALLTYPE InvokeEx(
/* [in] */ DISPID id,
@@ -140,50 +140,50 @@ public:
/* [in] */ DISPPARAMS __RPC_FAR *pdp,
/* [out] */ VARIANT __RPC_FAR *pvarRes,
/* [out] */ EXCEPINFO __RPC_FAR *pei,
- /* [unique][in] */ IServiceProvider __RPC_FAR *pspCaller);
+ /* [unique][in] */ IServiceProvider __RPC_FAR *pspCaller) override;
virtual HRESULT STDMETHODCALLTYPE DeleteMemberByName(
/* [in] */ BSTR bstr,
- /* [in] */ DWORD grfdex);
+ /* [in] */ DWORD grfdex) override;
virtual HRESULT STDMETHODCALLTYPE DeleteMemberByDispID(
- /* [in] */ DISPID id);
+ /* [in] */ DISPID id) override;
virtual HRESULT STDMETHODCALLTYPE GetMemberProperties(
/* [in] */ DISPID id,
/* [in] */ DWORD grfdexFetch,
- /* [out] */ DWORD __RPC_FAR *pgrfdex);
+ /* [out] */ DWORD __RPC_FAR *pgrfdex) override;
virtual HRESULT STDMETHODCALLTYPE GetMemberName(
/* [in] */ DISPID id,
- /* [out] */ BSTR __RPC_FAR *pbstrName);
+ /* [out] */ BSTR __RPC_FAR *pbstrName) override;
virtual HRESULT STDMETHODCALLTYPE GetNextDispID(
/* [in] */ DWORD grfdex,
/* [in] */ DISPID id,
- /* [out] */ DISPID __RPC_FAR *pid);
+ /* [out] */ DISPID __RPC_FAR *pid) override;
virtual HRESULT STDMETHODCALLTYPE GetNameSpaceParent(
- /* [out] */ IUnknown __RPC_FAR *__RPC_FAR *ppunk);
+ /* [out] */ IUnknown __RPC_FAR *__RPC_FAR *ppunk) override;
// XBridgeSupplier2 ---------------------------------------------------
virtual Any SAL_CALL createBridge(const Any& modelDepObject,
const Sequence<sal_Int8>& ProcessId,
sal_Int16 sourceModelType,
sal_Int16 destModelType)
- throw (IllegalArgumentException, RuntimeException);
+ throw (IllegalArgumentException, RuntimeException) override;
//XInitialization -----------------------------------------------------
- virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException);
+ virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) override;
// IUnoObjectWrapper
- STDMETHOD( getWrapperXInterface)( Reference<XInterface>* pXInt);
- STDMETHOD( getOriginalUnoObject)( Reference<XInterface>* pXInt);
- STDMETHOD( getOriginalUnoStruct)( Any * pStruct);
+ STDMETHOD( getWrapperXInterface)( Reference<XInterface>* pXInt) override;
+ STDMETHOD( getOriginalUnoObject)( Reference<XInterface>* pXInt) override;
+ STDMETHOD( getOriginalUnoStruct)( Any * pStruct) override;
// UnoConversionUtility
- virtual Reference< XInterface > createUnoWrapperInstance();
- virtual Reference< XInterface > createComWrapperInstance();
+ virtual Reference< XInterface > createUnoWrapperInstance() override;
+ virtual Reference< XInterface > createComWrapperInstance() override;
protected:
@@ -194,16 +194,16 @@ protected:
EXCEPINFO * pexcepinfo, OUString & name );
virtual HRESULT doSetProperty( DISPPARAMS * pdispparams, VARIANT * pvarResult,
- EXCEPINFO * pexcepinfo, unsigned int * puArgErr, OUString & name, Sequence<Any> params);
+ EXCEPINFO * pexcepinfo, unsigned int * puArgErr, OUString & name, Sequence<Any> const & params);
virtual HRESULT InvokeGeneral( DISPID dispidMember, unsigned short wFlags,
DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
- unsigned int * puArgErr, sal_Bool& bHandled);
+ unsigned int * puArgErr, bool& bHandled);
void convertDispparamsArgs( DISPID id, unsigned short wFlags, DISPPARAMS* pdispparams,
Sequence<Any>& rSeq);
- sal_Bool getInvocationInfoForCall(DISPID id, InvocationInfo& info);
+ bool getInvocationInfoForCall(DISPID id, InvocationInfo& info);
Reference<XInvocation> m_xInvocation;
Reference<XExactName> m_xExactName;
@@ -239,23 +239,23 @@ class UnoObjectWrapperRemoteOpt: public InterfaceOleWrapper_Impl
{
public:
UnoObjectWrapperRemoteOpt( Reference<XMultiServiceFactory>& aFactory, sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass);
- ~UnoObjectWrapperRemoteOpt();
+ ~UnoObjectWrapperRemoteOpt() override;
STDMETHOD( GetIDsOfNames )( REFIID riid, OLECHAR ** rgszNames, unsigned int cNames,
- LCID lcid, DISPID * rgdispid );
+ LCID lcid, DISPID * rgdispid ) override;
STDMETHOD( Invoke )( DISPID dispidMember, REFIID riid, LCID lcid, unsigned short wFlags,
DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
- unsigned int * puArgErr );
+ unsigned int * puArgErr ) override;
// UnoConversionUtility
// If UNO interfaces are converted in methods of this class then
// they are always wrapped with instances of this class
- virtual Reference< XInterface > createUnoWrapperInstance();
+ virtual Reference< XInterface > createUnoWrapperInstance() override;
protected:
- HRESULT methodInvoke( DISPID dispidMember, DISPPARAMS * pdispparams, VARIANT * pvarResult,
- EXCEPINFO * pexcepinfo, unsigned int * puArgErr, Sequence<Any> params);
+ static HRESULT methodInvoke( DISPID dispidMember, DISPPARAMS * pdispparams, VARIANT * pvarResult,
+ EXCEPINFO * pexcepinfo, unsigned int * puArgErr, Sequence<Any> const & params);
// In GetIDsOfNames are blindly passed out, that is without verifying
// the name. If two names are passed in during different calls to
// GetIDsOfNames and the names differ only in their cases then different