summaryrefslogtreecommitdiff
path: root/extensions/source/activex
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/activex')
-rw-r--r--extensions/source/activex/SOActionsApproval.cxx2
-rw-r--r--extensions/source/activex/SOActiveX.cxx10
-rw-r--r--extensions/source/activex/SOComWindowPeer.cxx2
-rw-r--r--extensions/source/activex/SODispatchInterceptor.cxx2
4 files changed, 8 insertions, 8 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[] =
{