-Werror,-Wmicrosoft-exception-spec (clang-cl)

No idea why that started to show up now, but
C:/Program Files (x86)/Windows Kits/10/Include/10.0.17763.0/um/combaseapi.h
contains

> #define STDMETHOD(method)        virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE method

while
C:/Program Files (x86)/Windows Kits/10/Include/10.0.17763.0/um/winnt.h
contains

> #define STDMETHODIMP            HRESULT STDMETHODCALLTYPE

which caused failures like

> [build CXX] embedserv/source/inprocserv/dllentry.cxx
> embedserv/source/inprocserv/dllentry.cxx(261,40): error: 'QueryInterface' is missing exception specification '__attribute__((nothrow))' [-Werror,-Wmicrosoft-exception-spec]
> STDMETHODIMP InprocEmbedProvider_Impl::QueryInterface( REFIID riid, void ** ppv )
>                                        ^
> embedserv/source/inprocserv/dllentry.cxx(143,15): note: previous declaration is here
>     STDMETHOD(QueryInterface)(REFIID riid, void ** ppvObj) override;
>               ^

Change-Id: I0fe3554c2da4089bf0f883e1132d6f2ee95ae2c3
Reviewed-on: https://gerrit.libreoffice.org/79970
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

8 files changed, 46 insertions, 46 deletions

diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx
index 6b2d179700e9..dec824dcebfa 100644
--- a/extensions/source/activex/SOActionsApproval.cxx
+++ b/extensions/source/activex/SOActionsApproval.cxx
@@ -37,7 +37,7 @@
 #pragma clang diagnostic pop
 #endif
 
-STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid)
+COM_DECLSPEC_NOTHROW STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid)
 {
     static const IID* arr[] =
     {
diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx
index ac8b5272c855..6133d61f415e 100644
--- a/extensions/source/activex/SOActiveX.cxx
+++ b/extensions/source/activex/SOActiveX.cxx
@@ -289,14 +289,14 @@ HRESULT CSOActiveX::TerminateOffice()
     return hr;
 }
 
-STDMETHODIMP CSOActiveX::InitNew ()
+COM_DECLSPEC_NOTHROW STDMETHODIMP CSOActiveX::InitNew ()
 {
     mnVersion = GetVersionConnected();
     mbLoad = TRUE;
     return S_OK;
 }
 
-STDMETHODIMP CSOActiveX::Load ( LPSTREAM /*pStm*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP CSOActiveX::Load ( LPSTREAM /*pStm*/ )
 {
     mnVersion = GetVersionConnected();
     mbLoad = TRUE;
@@ -307,7 +307,7 @@ STDMETHODIMP CSOActiveX::Load ( LPSTREAM /*pStm*/ )
     return S_OK;
 }
 
-STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG /*pErrorLog*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG /*pErrorLog*/ )
 {
     mnVersion = GetVersionConnected();
 
@@ -1090,7 +1090,7 @@ HRESULT CSOActiveX::OnDraw( ATL_DRAWINFO& di )
     return S_OK;
 }
 
-STDMETHODIMP CSOActiveX::SetClientSite( IOleClientSite* aClientSite )
+COM_DECLSPEC_NOTHROW STDMETHODIMP CSOActiveX::SetClientSite( IOleClientSite* aClientSite )
 {
     HRESULT hr = IOleObjectImpl<CSOActiveX>::SetClientSite( aClientSite );
 
@@ -1125,7 +1125,7 @@ STDMETHODIMP CSOActiveX::SetClientSite( IOleClientSite* aClientSite )
     return hr;
 }
 
-STDMETHODIMP CSOActiveX::Invoke(DISPID dispidMember,
+COM_DECLSPEC_NOTHROW STDMETHODIMP CSOActiveX::Invoke(DISPID dispidMember,
                                 REFIID riid,
                                 LCID lcid,
                                 WORD wFlags,
diff --git a/extensions/source/activex/SOComWindowPeer.cxx b/extensions/source/activex/SOComWindowPeer.cxx
index 4d1da0f2fad8..92303cd12f25 100644
--- a/extensions/source/activex/SOComWindowPeer.cxx
+++ b/extensions/source/activex/SOComWindowPeer.cxx
@@ -36,7 +36,7 @@
 #pragma clang diagnostic pop
 #endif
 
-STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid)
+COM_DECLSPEC_NOTHROW STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid)
 {
     static const IID* arr[] =
     {
diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx
index 8cfe36c9e981..a5f9aa91865c 100644
--- a/extensions/source/activex/SODispatchInterceptor.cxx
+++ b/extensions/source/activex/SODispatchInterceptor.cxx
@@ -39,7 +39,7 @@
 #pragma clang diagnostic pop
 #endif
 
-STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid)
+COM_DECLSPEC_NOTHROW STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid)
 {
     static const IID* arr[] =
     {
diff --git a/extensions/source/ole/jscriptclasses.cxx b/extensions/source/ole/jscriptclasses.cxx
index 718e7066d3b6..8fc371c4c29a 100644
--- a/extensions/source/ole/jscriptclasses.cxx
+++ b/extensions/source/ole/jscriptclasses.cxx
@@ -32,13 +32,13 @@ JScriptValue::~JScriptValue()
 
 
 // JScriptValue, IDispatch --------------------------------------------
-STDMETHODIMP JScriptValue::GetTypeInfoCount(UINT* /*pctinfo*/)
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::GetTypeInfoCount(UINT* /*pctinfo*/)
 {
     return E_NOTIMPL;
 }
 
 // JScriptValue, IDispatch --------------------------------------------
-STDMETHODIMP JScriptValue::GetTypeInfo( UINT /*iTInfo*/,
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::GetTypeInfo( UINT /*iTInfo*/,
                                            LCID /*lcid*/,
                                            ITypeInfo** /*ppTInfo*/)
 {
@@ -46,7 +46,7 @@ STDMETHODIMP JScriptValue::GetTypeInfo( UINT /*iTInfo*/,
 }
 
 // JScriptValue, IDispatch --------------------------------------------
-STDMETHODIMP JScriptValue::GetIDsOfNames( REFIID /*riid*/,
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::GetIDsOfNames( REFIID /*riid*/,
                                              LPOLESTR *rgszNames,
                                              UINT /*cNames*/,
                                              LCID /*lcid*/,
@@ -75,7 +75,7 @@ STDMETHODIMP JScriptValue::GetIDsOfNames( REFIID /*riid*/,
 }
 
 // JScriptValue, IDispatch --------------------------------------------
-STDMETHODIMP JScriptValue::Invoke( DISPID dispIdMember,
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::Invoke( DISPID dispIdMember,
                          REFIID /*riid*/,
                          LCID /*lcid*/,
                          WORD wFlags,
@@ -133,7 +133,7 @@ STDMETHODIMP JScriptValue::Invoke( DISPID dispIdMember,
 }
 
 // JScriptValue, IScriptOutParam-----------------------
-STDMETHODIMP JScriptValue::Set( VARIANT type, VARIANT value)
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::Set( VARIANT type, VARIANT value)
 {
     Lock();
     m_varValue.Clear();
@@ -146,7 +146,7 @@ STDMETHODIMP JScriptValue::Set( VARIANT type, VARIANT value)
     return hr;
 }
 // JScriptValue, IScriptOutParam-----------------------
-STDMETHODIMP JScriptValue::Get( VARIANT *val)
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::Get( VARIANT *val)
 {
     Lock();
     if( !val)
@@ -156,7 +156,7 @@ STDMETHODIMP JScriptValue::Get( VARIANT *val)
     return hr;
 }
 
-STDMETHODIMP JScriptValue::InitOutParam()
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::InitOutParam()
 {
     Lock();
     m_varValue.Clear();
@@ -166,7 +166,7 @@ STDMETHODIMP JScriptValue::InitOutParam()
     return S_OK;
 }
 
-STDMETHODIMP JScriptValue::InitInOutParam( VARIANT type, VARIANT value)
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::InitInOutParam( VARIANT type, VARIANT value)
 {
     Lock();
     m_bInOutParam= true;
@@ -175,7 +175,7 @@ STDMETHODIMP JScriptValue::InitInOutParam( VARIANT type, VARIANT value)
     return Set( type, value);
 }
 
-STDMETHODIMP JScriptValue::IsOutParam( VARIANT_BOOL * flag)
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::IsOutParam( VARIANT_BOOL * flag)
 {
     Lock();
     if( !flag)
@@ -185,7 +185,7 @@ STDMETHODIMP JScriptValue::IsOutParam( VARIANT_BOOL * flag)
     return S_OK;
 }
 
-STDMETHODIMP JScriptValue::IsInOutParam( VARIANT_BOOL * flag)
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::IsInOutParam( VARIANT_BOOL * flag)
 {
     Lock();
     if( !flag)
@@ -195,7 +195,7 @@ STDMETHODIMP JScriptValue::IsInOutParam( VARIANT_BOOL * flag)
     return S_OK;
 }
 
-STDMETHODIMP JScriptValue::GetValue( BSTR* type, VARIANT *value)
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptValue::GetValue( BSTR* type, VARIANT *value)
 {
     Lock();
     if( !type || !value)
@@ -221,13 +221,13 @@ JScriptOutParam::~JScriptOutParam()
 
 
 // JScriptOutParam, IDispatch --------------------------------------------
-STDMETHODIMP JScriptOutParam::GetTypeInfoCount(UINT* /*pctinfo*/)
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptOutParam::GetTypeInfoCount(UINT* /*pctinfo*/)
 {
     return E_NOTIMPL;
 }
 
 // JScriptOutParam, IDispatch --------------------------------------------
-STDMETHODIMP JScriptOutParam::GetTypeInfo( UINT /*iTInfo*/,
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptOutParam::GetTypeInfo( UINT /*iTInfo*/,
                                            LCID /*lcid*/,
                                            ITypeInfo** /*ppTInfo*/)
 {
@@ -235,7 +235,7 @@ STDMETHODIMP JScriptOutParam::GetTypeInfo( UINT /*iTInfo*/,
 }
 
 // JScriptOutParam, IDispatch --------------------------------------------
-STDMETHODIMP JScriptOutParam::GetIDsOfNames( REFIID /*riid*/,
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptOutParam::GetIDsOfNames( REFIID /*riid*/,
                                              LPOLESTR *rgszNames,
                                              UINT /*cNames*/,
                                              LCID /*lcid*/,
@@ -258,7 +258,7 @@ STDMETHODIMP JScriptOutParam::GetIDsOfNames( REFIID /*riid*/,
 }
 
 // JScriptOutParam, IDispatch --------------------------------------------
-STDMETHODIMP JScriptOutParam::Invoke( DISPID dispIdMember,
+COM_DECLSPEC_NOTHROW STDMETHODIMP JScriptOutParam::Invoke( DISPID dispIdMember,
                          REFIID /*riid*/,
                          LCID /*lcid*/,
                          WORD wFlags,
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index e59c8d0e6076..1f14fa01032d 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -101,7 +101,7 @@ bool OneInstanceOleWrapper::deregisterClass()
     return CoRevokeClassObject(m_factoryHandle) == NOERROR;
 }
 
-STDMETHODIMP OneInstanceOleWrapper::QueryInterface(REFIID riid, void ** ppv)
+COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::QueryInterface(REFIID riid, void ** ppv)
 {
     if(IsEqualIID(riid, IID_IUnknown))
     {
@@ -120,12 +120,12 @@ STDMETHODIMP OneInstanceOleWrapper::QueryInterface(REFIID riid, void ** ppv)
     return ResultFromScode(E_NOINTERFACE);
 }
 
-STDMETHODIMP_(ULONG) OneInstanceOleWrapper::AddRef()
+COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) OneInstanceOleWrapper::AddRef()
 {
     return osl_atomic_increment( &m_refCount);
 }
 
-STDMETHODIMP_(ULONG) OneInstanceOleWrapper::Release()
+COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) OneInstanceOleWrapper::Release()
 {
     MutexGuard oGuard( Mutex::getGlobalMutex());
     ULONG refCount = --m_refCount;
@@ -137,7 +137,7 @@ STDMETHODIMP_(ULONG) OneInstanceOleWrapper::Release()
     return refCount;
 }
 
-STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown FAR* punkOuter,
+COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown FAR* punkOuter,
                                                    REFIID riid,
                                                    void FAR* FAR* ppv)
 {
@@ -178,7 +178,7 @@ STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown FAR* punkOuter,
     return ret;
 }
 
-STDMETHODIMP OneInstanceOleWrapper::LockServer(BOOL /*fLock*/)
+COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::LockServer(BOOL /*fLock*/)
 {
     return NOERROR;
 }
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 485f31959969..3c95a9c16168 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -205,7 +205,7 @@ InterfaceOleWrapper::~InterfaceOleWrapper()
     SAL_INFO("extensions.olebridge", "InterfaceOleWrapper DTOR, count=" << TerminationVetoer::get()->mnCount);
 }
 
-STDMETHODIMP InterfaceOleWrapper::QueryInterface(REFIID riid, void ** ppv)
+COM_DECLSPEC_NOTHROW STDMETHODIMP InterfaceOleWrapper::QueryInterface(REFIID riid, void ** ppv)
 {
     comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
@@ -257,7 +257,7 @@ STDMETHODIMP InterfaceOleWrapper::QueryInterface(REFIID riid, void ** ppv)
     return ret;
 }
 
-STDMETHODIMP_(ULONG) InterfaceOleWrapper::AddRef()
+COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) InterfaceOleWrapper::AddRef()
 {
     acquire();
     // does not need to guard because one should not rely on the return value of
@@ -265,7 +265,7 @@ STDMETHODIMP_(ULONG) InterfaceOleWrapper::AddRef()
     return m_refCount;
 }
 
-STDMETHODIMP_(ULONG) InterfaceOleWrapper::Release()
+COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) InterfaceOleWrapper::Release()
 {
     ULONG n= m_refCount;
     release();
@@ -273,17 +273,17 @@ STDMETHODIMP_(ULONG) InterfaceOleWrapper::Release()
 }
 
 // IUnoObjectWrapper --------------------------------------------------------
-STDMETHODIMP InterfaceOleWrapper::getWrapperXInterface( Reference<XInterface>* pXInt)
+COM_DECLSPEC_NOTHROW STDMETHODIMP InterfaceOleWrapper::getWrapperXInterface( Reference<XInterface>* pXInt)
 {
     pXInt->set( static_cast<XWeak*>( this), UNO_QUERY);
     return pXInt->is() ? S_OK : E_FAIL;
 }
-STDMETHODIMP InterfaceOleWrapper::getOriginalUnoObject( Reference<XInterface>* pXInt)
+COM_DECLSPEC_NOTHROW STDMETHODIMP InterfaceOleWrapper::getOriginalUnoObject( Reference<XInterface>* pXInt)
 {
     *pXInt= m_xOrigin;
     return m_xOrigin.is() ? S_OK : E_FAIL;
 }
-STDMETHODIMP  InterfaceOleWrapper::getOriginalUnoStruct( Any * pStruct)
+COM_DECLSPEC_NOTHROW STDMETHODIMP  InterfaceOleWrapper::getOriginalUnoStruct( Any * pStruct)
 {
     comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
@@ -304,7 +304,7 @@ STDMETHODIMP  InterfaceOleWrapper::getOriginalUnoStruct( Any * pStruct)
     return ret;
 }
 
-STDMETHODIMP InterfaceOleWrapper::GetTypeInfoCount( UINT *pctinfo )
+COM_DECLSPEC_NOTHROW STDMETHODIMP InterfaceOleWrapper::GetTypeInfoCount( UINT *pctinfo )
 {
     SAL_INFO("extensions.olebridge", this << "@InterfaceOleWrapper::GetTypeInfoCount");
 
@@ -1094,7 +1094,7 @@ void STDMETHODCALLTYPE CXTypeInfo::ReleaseVarDesc(VARDESC *)
     SAL_WARN("extensions.olebridge", this << "@CXTypeInfo::ReleaseVarDesc: E_NOTIMPL");
 }
 
-STDMETHODIMP InterfaceOleWrapper::GetTypeInfo(UINT iTInfo, LCID, ITypeInfo ** ppTInfo)
+COM_DECLSPEC_NOTHROW STDMETHODIMP InterfaceOleWrapper::GetTypeInfo(UINT iTInfo, LCID, ITypeInfo ** ppTInfo)
 {
     comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
@@ -1136,7 +1136,7 @@ STDMETHODIMP InterfaceOleWrapper::GetTypeInfo(UINT iTInfo, LCID, ITypeInfo ** pp
     return S_OK;
 }
 
-STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
+COM_DECLSPEC_NOTHROW STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
                                                 LPOLESTR * rgszNames,
                                                 UINT cNames,
                                                 LCID /*lcid*/,
@@ -1864,7 +1864,7 @@ static bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource)
     return ret;
 }
 
-STDMETHODIMP InterfaceOleWrapper::Invoke(DISPID dispidMember,
+COM_DECLSPEC_NOTHROW STDMETHODIMP InterfaceOleWrapper::Invoke(DISPID dispidMember,
                                          REFIID /*riid*/,
                                          LCID /*lcid*/,
                                          WORD wFlags,
@@ -3130,7 +3130,7 @@ Reference< XInterface > UnoObjectWrapperRemoteOpt::createUnoWrapperInstance()
     return Reference<XInterface>( xWeak, UNO_QUERY);
 }
 
-STDMETHODIMP  UnoObjectWrapperRemoteOpt::GetIDsOfNames ( REFIID /*riid*/, LPOLESTR * rgszNames, UINT cNames,
+COM_DECLSPEC_NOTHROW STDMETHODIMP  UnoObjectWrapperRemoteOpt::GetIDsOfNames ( REFIID /*riid*/, LPOLESTR * rgszNames, UINT cNames,
                                 LCID /*lcid*/, DISPID * rgdispid )
 {
     MutexGuard guard( getBridgeMutex());
@@ -3177,7 +3177,7 @@ STDMETHODIMP  UnoObjectWrapperRemoteOpt::GetIDsOfNames ( REFIID /*riid*/, LPOLES
     return ret;
 }
 
-STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*riid*/, LCID /*lcid*/, WORD wFlags,
+COM_DECLSPEC_NOTHROW STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*riid*/, LCID /*lcid*/, WORD wFlags,
                          DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
                          UINT * puArgErr )
 {
diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx
index b54b5a37209e..2824e8ef7b27 100644
--- a/extensions/source/ole/unotypewrapper.cxx
+++ b/extensions/source/ole/unotypewrapper.cxx
@@ -61,13 +61,13 @@ UnoTypeWrapper::~UnoTypeWrapper()
 
 
 // UnoTypeWrapper, IDispatch --------------------------------------------
-STDMETHODIMP UnoTypeWrapper::GetTypeInfoCount(UINT* /*pctinfo*/)
+COM_DECLSPEC_NOTHROW STDMETHODIMP UnoTypeWrapper::GetTypeInfoCount(UINT* /*pctinfo*/)
 {
     return E_NOTIMPL;
 }
 
 // UnoTypeWrapper, IDispatch --------------------------------------------
-STDMETHODIMP UnoTypeWrapper::GetTypeInfo( UINT /*iTInfo*/,
+COM_DECLSPEC_NOTHROW STDMETHODIMP UnoTypeWrapper::GetTypeInfo( UINT /*iTInfo*/,
                                           LCID /*lcid*/,
                                           ITypeInfo** /*ppTInfo*/)
 {
@@ -75,7 +75,7 @@ STDMETHODIMP UnoTypeWrapper::GetTypeInfo( UINT /*iTInfo*/,
 }
 
 // UnoTypeWrapper, IDispatch --------------------------------------------
-STDMETHODIMP UnoTypeWrapper::GetIDsOfNames( REFIID /*riid*/,
+COM_DECLSPEC_NOTHROW STDMETHODIMP UnoTypeWrapper::GetIDsOfNames( REFIID /*riid*/,
                                             LPOLESTR *rgszNames,
                                             UINT /*cNames*/,
                                             LCID /*lcid*/,
@@ -97,7 +97,7 @@ STDMETHODIMP UnoTypeWrapper::GetIDsOfNames( REFIID /*riid*/,
 }
 
 // UnoTypeWrapper, IDispatch --------------------------------------------
-STDMETHODIMP UnoTypeWrapper::Invoke( DISPID dispIdMember,
+COM_DECLSPEC_NOTHROW STDMETHODIMP UnoTypeWrapper::Invoke( DISPID dispIdMember,
                          REFIID /*riid*/,
                          LCID /*lcid*/,
                          WORD wFlags,
@@ -137,7 +137,7 @@ STDMETHODIMP UnoTypeWrapper::Invoke( DISPID dispIdMember,
 }
 
 // IUnoTypeWrapper-----------------------
-STDMETHODIMP UnoTypeWrapper::put_Name(BSTR  val)
+COM_DECLSPEC_NOTHROW STDMETHODIMP UnoTypeWrapper::put_Name(BSTR  val)
 {
      Lock();
      m_sName = val;
@@ -146,7 +146,7 @@ STDMETHODIMP UnoTypeWrapper::put_Name(BSTR  val)
 }
 
 // (UnoTypeWrapper-----------------------
-STDMETHODIMP UnoTypeWrapper::get_Name(BSTR  *pVal)
+COM_DECLSPEC_NOTHROW STDMETHODIMP UnoTypeWrapper::get_Name(BSTR  *pVal)
 {
      Lock();
      if( !pVal)