summaryrefslogtreecommitdiff
path: root/winaccessibility/source/UAccCOM/EnumVariant.h
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-14 16:43:38 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-15 07:59:24 +0000
commitf8854116e1c3bbe971dcb754f7db501d5302b651 (patch)
treea9e59bebff027d39c756c6b89d9b65e5533e834e /winaccessibility/source/UAccCOM/EnumVariant.h
parentdd63b7431164cbc7de5ac62df44aeba344c009c5 (diff)
clang-cl loplugin: winaccessibility
Change-Id: I40f8a6fef9d66b28a1d72551a6873b041b38b09d Reviewed-on: https://gerrit.libreoffice.org/29840 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'winaccessibility/source/UAccCOM/EnumVariant.h')
-rw-r--r--winaccessibility/source/UAccCOM/EnumVariant.h23
1 files changed, 15 insertions, 8 deletions
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h
index 5bdf7ea62f35..0615d6105d39 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.h
+++ b/winaccessibility/source/UAccCOM/EnumVariant.h
@@ -45,8 +45,8 @@ class ATL_NO_VTABLE CEnumVariant :
public:
CEnumVariant()
:m_lLBound(0),
- pUNOInterface(NULL),
- m_pXAccessibleSelection(NULL)
+ pUNOInterface(nullptr),
+ m_pXAccessibleSelection(nullptr)
{
m_lCurrent = m_lLBound;
}
@@ -60,31 +60,38 @@ public:
BEGIN_COM_MAP(CEnumVariant)
COM_INTERFACE_ENTRY(IEnumVariant)
COM_INTERFACE_ENTRY(IEnumVARIANT)
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winconsistent-missing-override"
+#endif
END_COM_MAP()
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
// IEnumVariant
public:
- STDMETHOD(ClearEnumeration)();
+ STDMETHOD(ClearEnumeration)() override;
// IEnumVARIANT
- HRESULT STDMETHODCALLTYPE Next(ULONG cElements,VARIANT __RPC_FAR *pvar,ULONG __RPC_FAR *pcElementFetched);
+ HRESULT STDMETHODCALLTYPE Next(ULONG cElements,VARIANT __RPC_FAR *pvar,ULONG __RPC_FAR *pcElementFetched) override;
- HRESULT STDMETHODCALLTYPE Skip(ULONG cElements);
+ HRESULT STDMETHODCALLTYPE Skip(ULONG cElements) override;
- HRESULT STDMETHODCALLTYPE Reset( void);
+ HRESULT STDMETHODCALLTYPE Reset( void) override;
- HRESULT STDMETHODCALLTYPE Clone(IEnumVARIANT __RPC_FAR *__RPC_FAR *ppenum);
+ HRESULT STDMETHODCALLTYPE Clone(IEnumVARIANT __RPC_FAR *__RPC_FAR *ppenum) override;
// IEnumVariant
- HRESULT STDMETHODCALLTYPE PutSelection(hyper pXSelection);
+ HRESULT STDMETHODCALLTYPE PutSelection(hyper pXSelection) override;
static HRESULT STDMETHODCALLTYPE Create(CEnumVariant __RPC_FAR *__RPC_FAR *ppenum);