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>

1 files changed, 26 insertions, 12 deletions

diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h
index 570b37ee253b..04055eaf74df 100644
--- a/extensions/source/activex/SOActiveX.h
+++ b/extensions/source/activex/SOActiveX.h
@@ -19,8 +19,8 @@
 
 // SOActiveX.h : Declaration of the CSOActiveX
 
-#ifndef __SOACTIVEX_H_
-#define __SOACTIVEX_H_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOACTIVEX_H
+#define INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOACTIVEX_H
 
 #include "resource.h"
 
@@ -104,7 +104,7 @@ protected:
 
 public:
     CSOActiveX();
-    ~CSOActiveX();
+    ~CSOActiveX() override;
 
 DECLARE_REGISTRY_RESOURCEID(IDR_SOACTIVEX)
 
@@ -129,7 +129,14 @@ BEGIN_COM_MAP(CSOActiveX)
     COM_INTERFACE_ENTRY(IProvideClassInfo2)
     COM_INTERFACE_ENTRY(IPersistPropertyBag)
     COM_INTERFACE_ENTRY(IObjectSafety)
+#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
 
 #if defined __clang__
 #pragma clang diagnostic push
@@ -151,7 +158,14 @@ END_PROP_MAP()
 BEGIN_CONNECTION_POINT_MAP(CSOActiveX)
 END_CONNECTION_POINT_MAP()
 
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winconsistent-missing-override"
+#endif
 BEGIN_MSG_MAP(CSOActiveX)
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
     CHAIN_MSG_MAP(CComControl<CSOActiveX>)
     DEFAULT_REFLECTION_HANDLER()
 END_MSG_MAP()
@@ -163,12 +177,12 @@ END_MSG_MAP()
 
 
 // IViewObjectEx
-    DECLARE_VIEW_STATUS(VIEWSTATUS_SOLIDBKGND | VIEWSTATUS_OPAQUE)
+    static DECLARE_VIEW_STATUS(VIEWSTATUS_SOLIDBKGND | VIEWSTATUS_OPAQUE)
 
 // ISOActiveX
 public:
 
-    STDMETHOD(SetClientSite)( IOleClientSite* aClientSite );
+    STDMETHOD(SetClientSite)( IOleClientSite* aClientSite ) override;
     STDMETHOD(Invoke)(  DISPID dispidMember,
                         REFIID riid,
                         LCID lcid,
@@ -176,12 +190,12 @@ public:
                         DISPPARAMS* pDispParams,
                         VARIANT* pvarResult,
                         EXCEPINFO* pExcepInfo,
-                        UINT* puArgErr);
-    STDMETHOD(Load) ( LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog );
-    STDMETHOD(Load) ( LPSTREAM pStm );
-    STDMETHOD(InitNew) ();
-    HRESULT OnDrawAdvanced(ATL_DRAWINFO& di);
-    HRESULT OnDraw(ATL_DRAWINFO& di);
+                        UINT* puArgErr) override;
+    STDMETHOD(Load) ( LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog ) override;
+    STDMETHOD(Load) ( LPSTREAM pStm ) override;
+    STDMETHOD(InitNew) () override;
+    HRESULT OnDrawAdvanced(ATL_DRAWINFO& di) override;
+    HRESULT OnDraw(ATL_DRAWINFO& di) override;
 
     HRESULT SetLayoutManagerProps();
     HRESULT CreateFrameOldWay( HWND hwnd, int width, int height );
@@ -201,6 +215,6 @@ public:
     SOVersion GetVersionConnected();
 };
 
-#endif //__SOACTIVEX_H_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */