-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>

5 files changed, 59 insertions, 59 deletions

diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index 9e602867c856..2f0b4d960b16 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -64,7 +64,7 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( bool isEnhMeta )
 
 // IDataObject
 
-STDMETHODIMP EmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIUM * pMedium )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIUM * pMedium )
 {
     if ( !pFormatetc )
         return DV_E_FORMATETC;
@@ -141,7 +141,7 @@ STDMETHODIMP EmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIUM * pM
     return DV_E_FORMATETC;
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pMedium )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pMedium )
 {
     if ( !pFormatetc )
         return DV_E_FORMATETC;
@@ -176,7 +176,7 @@ STDMETHODIMP EmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGMEDIUM
     return DV_E_FORMATETC;
 }
 
-STDMETHODIMP EmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
 {
     if ( pFormatetc )
     {
@@ -217,7 +217,7 @@ STDMETHODIMP EmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
 
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pFormatetcIn, FORMATETC * pFormatetcOut )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pFormatetcIn, FORMATETC * pFormatetcOut )
 {
     if ( !pFormatetcIn || !pFormatetcOut )
         return DV_E_FORMATETC;
@@ -250,12 +250,12 @@ STDMETHODIMP EmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pFormatetcIn
     return DV_E_FORMATETC;
 }
 
-STDMETHODIMP EmbedDocument_Impl::SetData( FORMATETC * /*pFormatetc*/, STGMEDIUM * /*pMedium*/, BOOL /*fRelease*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SetData( FORMATETC * /*pFormatetc*/, STGMEDIUM * /*pMedium*/, BOOL /*fRelease*/ )
 {
     return E_NOTIMPL;
 }
 
-STDMETHODIMP EmbedDocument_Impl::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC ** /*ppFormatetc*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC ** /*ppFormatetc*/ )
 {
     if ( dwDirection == DATADIR_GET )
         return OLE_S_USEREG;
@@ -263,7 +263,7 @@ STDMETHODIMP EmbedDocument_Impl::EnumFormatEtc( DWORD dwDirection, IEnumFORMATET
     return E_NOTIMPL;
 }
 
-STDMETHODIMP EmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD * pdwConnection )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD * pdwConnection )
 {
     if ( !m_pDAdviseHolder )
         if ( !SUCCEEDED( CreateDataAdviseHolder( &m_pDAdviseHolder ) ) || !m_pDAdviseHolder )
@@ -272,7 +272,7 @@ STDMETHODIMP EmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD advf, IA
     return m_pDAdviseHolder->Advise( static_cast<IDataObject*>(this), pFormatetc, advf, pAdvSink, pdwConnection );
 }
 
-STDMETHODIMP EmbedDocument_Impl::DUnadvise( DWORD dwConnection )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::DUnadvise( DWORD dwConnection )
 {
     if ( !m_pDAdviseHolder )
         if ( !SUCCEEDED( CreateDataAdviseHolder( &m_pDAdviseHolder ) ) || !m_pDAdviseHolder )
@@ -281,7 +281,7 @@ STDMETHODIMP EmbedDocument_Impl::DUnadvise( DWORD dwConnection )
     return m_pDAdviseHolder->Unadvise( dwConnection );
 }
 
-STDMETHODIMP EmbedDocument_Impl::EnumDAdvise( IEnumSTATDATA ** ppenumAdvise )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::EnumDAdvise( IEnumSTATDATA ** ppenumAdvise )
 {
     if ( !m_pDAdviseHolder )
         if ( !SUCCEEDED( CreateDataAdviseHolder( &m_pDAdviseHolder ) ) || !m_pDAdviseHolder )
diff --git a/embedserv/source/embed/ed_iinplace.cxx b/embedserv/source/embed/ed_iinplace.cxx
index 710ea722b6a0..0c6e869e633c 100644
--- a/embedserv/source/embed/ed_iinplace.cxx
+++ b/embedserv/source/embed/ed_iinplace.cxx
@@ -21,7 +21,7 @@
 #include <osl/diagnose.h>
 
 
-STDMETHODIMP EmbedDocument_Impl::GetWindow(HWND *hWnd)
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetWindow(HWND *hWnd)
 {
     OSL_ENSURE(m_pDocHolder,"no document for inplace activation");
 
@@ -32,12 +32,12 @@ STDMETHODIMP EmbedDocument_Impl::GetWindow(HWND *hWnd)
         return ERROR;
 }
 
-STDMETHODIMP EmbedDocument_Impl::ContextSensitiveHelp(BOOL)
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::ContextSensitiveHelp(BOOL)
 {
     return NOERROR;
 }
 
-STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate()
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate()
 {
     // no locking is used since the OLE must use the same thread always
     if ( m_bIsInVerbHandling )
@@ -54,7 +54,7 @@ STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate()
     return NOERROR;
 }
 
-STDMETHODIMP EmbedDocument_Impl::UIDeactivate()
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::UIDeactivate()
 {
     // no locking is used since the OLE must use the same thread always
     if ( m_bIsInVerbHandling )
@@ -72,14 +72,14 @@ STDMETHODIMP EmbedDocument_Impl::UIDeactivate()
     return NOERROR;
 }
 
-STDMETHODIMP EmbedDocument_Impl::SetObjectRects(LPCRECT aRect, LPCRECT aClip)
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SetObjectRects(LPCRECT aRect, LPCRECT aClip)
 {
     OSL_ENSURE(m_pDocHolder,"no document for inplace activation");
 
     return m_pDocHolder->SetObjectRects(aRect,aClip);
 }
 
-STDMETHODIMP EmbedDocument_Impl::ReactivateAndUndo()
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::ReactivateAndUndo()
 {
     return E_NOTIMPL;
 }
diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx
index 19438dbe3e40..a84b1c2bdedd 100644
--- a/embedserv/source/embed/ed_ioleobject.cxx
+++ b/embedserv/source/embed/ed_ioleobject.cxx
@@ -28,19 +28,19 @@ using namespace ::com::sun::star;
 // IOleObject
 
 
-STDMETHODIMP EmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
 {
     m_pClientSite = pSite;
     return S_OK;
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetClientSite( IOleClientSite** pSite )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetClientSite( IOleClientSite** pSite )
 {
     *pSite = m_pClientSite;
     return S_OK;
 }
 
-STDMETHODIMP EmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, LPCOLESTR szContainerObj )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, LPCOLESTR szContainerObj )
 {
     // the code should be ignored for links
     if ( !m_aFileName.getLength() )
@@ -52,7 +52,7 @@ STDMETHODIMP EmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, LPCOLES
     return S_OK;
 }
 
-STDMETHODIMP EmbedDocument_Impl::Close( DWORD dwSaveOption )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Close( DWORD dwSaveOption )
 {
     HRESULT hr = S_OK;
 
@@ -100,22 +100,22 @@ HRESULT EmbedDocument_Impl::OLENotifyClosing()
 
 }
 
-STDMETHODIMP EmbedDocument_Impl::SetMoniker( DWORD /*dwWhichMoniker*/, IMoniker * /*pmk*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SetMoniker( DWORD /*dwWhichMoniker*/, IMoniker * /*pmk*/ )
 {
     return E_NOTIMPL;
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetMoniker( DWORD /*dwAssign*/, DWORD /*dwWhichMoniker*/, IMoniker ** /*ppmk*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetMoniker( DWORD /*dwAssign*/, DWORD /*dwWhichMoniker*/, IMoniker ** /*ppmk*/ )
 {
     return E_NOTIMPL;
 }
 
-STDMETHODIMP EmbedDocument_Impl::InitFromData( IDataObject * /*pDataObject*/, BOOL /*fCreation*/, DWORD /*dwReserved*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::InitFromData( IDataObject * /*pDataObject*/, BOOL /*fCreation*/, DWORD /*dwReserved*/ )
 {
     return E_NOTIMPL;
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetClipboardData( DWORD /*dwReserved*/, IDataObject ** /*ppDataObject*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetClipboardData( DWORD /*dwReserved*/, IDataObject ** /*ppDataObject*/ )
 {
     return E_NOTIMPL;
 }
@@ -125,7 +125,7 @@ STDMETHODIMP EmbedDocument_Impl::GetClipboardData( DWORD /*dwReserved*/, IDataOb
  *
  */
 
-STDMETHODIMP EmbedDocument_Impl::DoVerb(
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::DoVerb(
     LONG iVerb,
     LPMSG,
     IOleClientSite *pActiveSite,
@@ -233,34 +233,34 @@ STDMETHODIMP EmbedDocument_Impl::DoVerb(
 }
 
 
-STDMETHODIMP EmbedDocument_Impl::EnumVerbs( IEnumOLEVERB ** /*ppEnumOleVerb*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::EnumVerbs( IEnumOLEVERB ** /*ppEnumOleVerb*/ )
 {
     return OLE_S_USEREG;
 }
 
-STDMETHODIMP EmbedDocument_Impl::Update()
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Update()
 {
     return S_OK;
 //    HRESULT hr = CACHE_E_NOCACHE_UPDATED;
 //    return hr;
 }
 
-STDMETHODIMP EmbedDocument_Impl::IsUpToDate()
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::IsUpToDate()
 {
     return S_OK;
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetUserClassID( CLSID *pClsid )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetUserClassID( CLSID *pClsid )
 {
     return GetClassID( pClsid );
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetUserType( DWORD /*dwFormOfTypeUe*/, LPOLESTR * /*pszUserType*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetUserType( DWORD /*dwFormOfTypeUe*/, LPOLESTR * /*pszUserType*/ )
 {
     return OLE_S_USEREG;
 }
 
-STDMETHODIMP EmbedDocument_Impl::SetExtent( DWORD /*dwDrawAspect*/, SIZEL *psizel )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SetExtent( DWORD /*dwDrawAspect*/, SIZEL *psizel )
 {
     if ( !psizel )
         return E_FAIL;
@@ -270,7 +270,7 @@ STDMETHODIMP EmbedDocument_Impl::SetExtent( DWORD /*dwDrawAspect*/, SIZEL *psize
     return S_OK;
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetExtent( DWORD /*dwDrawAspect*/, SIZEL * psizel )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetExtent( DWORD /*dwDrawAspect*/, SIZEL * psizel )
 {
     if ( !psizel )
         return E_INVALIDARG;
@@ -285,7 +285,7 @@ STDMETHODIMP EmbedDocument_Impl::GetExtent( DWORD /*dwDrawAspect*/, SIZEL * psiz
     return S_OK;
 }
 
-STDMETHODIMP EmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdwConnection )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdwConnection )
 {
     if ( m_nAdviseNum == 0xFFFFFFFF )
         return E_OUTOFMEMORY;
@@ -297,7 +297,7 @@ STDMETHODIMP EmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdwConnec
     return S_OK;
 }
 
-STDMETHODIMP EmbedDocument_Impl::Unadvise( DWORD dwConnection )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Unadvise( DWORD dwConnection )
 {
     auto iAdvise = m_aAdviseHashMap.find( dwConnection );
     if ( iAdvise != m_aAdviseHashMap.end() )
@@ -311,17 +311,17 @@ STDMETHODIMP EmbedDocument_Impl::Unadvise( DWORD dwConnection )
     return S_OK;
 }
 
-STDMETHODIMP EmbedDocument_Impl::EnumAdvise( IEnumSTATDATA ** /*ppenumAdvise*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::EnumAdvise( IEnumSTATDATA ** /*ppenumAdvise*/ )
 {
     return E_NOTIMPL;
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetMiscStatus( DWORD /*dwAspect*/, DWORD * /*pdwStatus*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetMiscStatus( DWORD /*dwAspect*/, DWORD * /*pdwStatus*/ )
 {
     return OLE_S_USEREG;
 }
 
-STDMETHODIMP EmbedDocument_Impl::SetColorScheme( LOGPALETTE * /*pLogpal*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SetColorScheme( LOGPALETTE * /*pLogpal*/ )
 {
     return E_NOTIMPL;
 }
@@ -329,7 +329,7 @@ STDMETHODIMP EmbedDocument_Impl::SetColorScheme( LOGPALETTE * /*pLogpal*/ )
 
 // IDispatch
 
-STDMETHODIMP EmbedDocument_Impl::GetTypeInfoCount( unsigned int FAR*  pctinfo )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfoCount( unsigned int FAR*  pctinfo )
 {
     if ( m_pDocHolder->GetIDispatch() )
         return m_pDocHolder->GetIDispatch()->GetTypeInfoCount( pctinfo );
@@ -337,7 +337,7 @@ STDMETHODIMP EmbedDocument_Impl::GetTypeInfoCount( unsigned int FAR*  pctinfo )
     return E_NOTIMPL;
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetTypeInfo( unsigned int iTInfo, LCID lcid, ITypeInfo FAR* FAR* ppTInfo )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfo( unsigned int iTInfo, LCID lcid, ITypeInfo FAR* FAR* ppTInfo )
 {
     if ( m_pDocHolder->GetIDispatch() )
         return m_pDocHolder->GetIDispatch()->GetTypeInfo( iTInfo, lcid, ppTInfo );
@@ -345,7 +345,7 @@ STDMETHODIMP EmbedDocument_Impl::GetTypeInfo( unsigned int iTInfo, LCID lcid, IT
     return DISP_E_BADINDEX; // the only error that can be returned
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetIDsOfNames( REFIID riid,
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetIDsOfNames( REFIID riid,
                                                 OLECHAR FAR* FAR* rgszNames,
                                                 unsigned int cNames,
                                                 LCID lcid,
@@ -360,7 +360,7 @@ STDMETHODIMP EmbedDocument_Impl::GetIDsOfNames( REFIID riid,
     return DISP_E_UNKNOWNNAME;
 }
 
-STDMETHODIMP EmbedDocument_Impl::Invoke( DISPID dispIdMember,
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Invoke( DISPID dispIdMember,
                                          REFIID riid,
                                          LCID lcid,
                                          WORD wFlags,
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index ba21f0772d8c..905055cc9513 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -274,7 +274,7 @@ HRESULT EmbedDocument_Impl::SaveTo_Impl( IStorage* pStg )
 
 // IUnknown
 
-STDMETHODIMP EmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv )
 {
     if(IsEqualIID(riid, IID_IUnknown))
     {
@@ -341,12 +341,12 @@ STDMETHODIMP EmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv
     return ResultFromScode(E_NOINTERFACE);
 }
 
-STDMETHODIMP_(ULONG) EmbedDocument_Impl::AddRef()
+COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) EmbedDocument_Impl::AddRef()
 {
     return osl_atomic_increment( &m_refCount);
 }
 
-STDMETHODIMP_(ULONG) EmbedDocument_Impl::Release()
+COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) EmbedDocument_Impl::Release()
 {
     // if there is a time when the last reference is destructed, that means that only internal pointers are alive
     // after the following call either the refcount is increased or the pointers are empty
@@ -362,7 +362,7 @@ STDMETHODIMP_(ULONG) EmbedDocument_Impl::Release()
 
 // IPersist
 
-STDMETHODIMP EmbedDocument_Impl::GetClassID( CLSID* pClassId )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetClassID( CLSID* pClassId )
 {
     *pClassId = m_guid;
     return S_OK;
@@ -371,7 +371,7 @@ STDMETHODIMP EmbedDocument_Impl::GetClassID( CLSID* pClassId )
 
 // IPersistStorage
 
-STDMETHODIMP EmbedDocument_Impl::IsDirty()
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::IsDirty()
 {
     // the link modified state is controlled by the document
     if ( m_bIsDirty && !m_aFileName.getLength() )
@@ -383,7 +383,7 @@ STDMETHODIMP EmbedDocument_Impl::IsDirty()
     return S_FALSE;
 }
 
-STDMETHODIMP EmbedDocument_Impl::InitNew( IStorage *pStg )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::InitNew( IStorage *pStg )
 {
     HRESULT hr = CO_E_ALREADYINITIALIZED;
 
@@ -469,7 +469,7 @@ STDMETHODIMP EmbedDocument_Impl::InitNew( IStorage *pStg )
     return hr;
 }
 
-STDMETHODIMP EmbedDocument_Impl::Load( IStorage *pStg )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Load( IStorage *pStg )
 {
     if ( m_pDocHolder->GetDocument().is() )
         return CO_E_ALREADYINITIALIZED;
@@ -577,7 +577,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( IStorage *pStg )
     return hr;
 }
 
-STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )
 {
     if ( !m_pDocHolder->GetDocument().is() || !m_xFactory.is() || !pStgSave || !m_pOwnStream || !m_pExtStream )
         return E_FAIL;
@@ -672,7 +672,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )
     return hr;
 }
 
-STDMETHODIMP EmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
 {
     // m_pOwnStream == NULL && m_pMasterStorage != NULL means the object is in NoScribble mode
     // m_pOwnStream == NULL && m_pMasterStorage == NULL means the object is in HandsOff mode
@@ -714,7 +714,7 @@ STDMETHODIMP EmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
     return S_OK;
 }
 
-STDMETHODIMP EmbedDocument_Impl::HandsOffStorage()
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::HandsOffStorage()
 {
     m_pMasterStorage = CComPtr< IStorage >();
     m_pOwnStream = CComPtr< IStream >();
@@ -726,7 +726,7 @@ STDMETHODIMP EmbedDocument_Impl::HandsOffStorage()
 
 // IPersistFile
 
-STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
 {
     if ( m_pDocHolder->GetDocument().is() )
         return CO_E_ALREADYINITIALIZED;
@@ -839,7 +839,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
     return hr;
 }
 
-STDMETHODIMP EmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember )
 {
     if ( !m_pDocHolder->GetDocument().is() || !m_xFactory.is() )
         return E_FAIL;
@@ -881,14 +881,14 @@ STDMETHODIMP EmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember )
     return hr;
 }
 
-STDMETHODIMP EmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )
 {
     // the different file name would mean error here
     m_aFileName = o3tl::toU(pszFileName);
     return S_OK;
 }
 
-STDMETHODIMP EmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName )
 {
     CComPtr<IMalloc> pMalloc;
 
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index 9be17eb071ec..09ef6211724e 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -169,7 +169,7 @@ bool EmbedProviderFactory_Impl::deregisterClass()
     return (hresult == NOERROR);
 }
 
-STDMETHODIMP EmbedProviderFactory_Impl::QueryInterface(REFIID riid, void FAR* FAR* ppv)
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::QueryInterface(REFIID riid, void FAR* FAR* ppv)
 {
     if(IsEqualIID(riid, IID_IUnknown))
     {
@@ -188,12 +188,12 @@ STDMETHODIMP EmbedProviderFactory_Impl::QueryInterface(REFIID riid, void FAR* FA
     return ResultFromScode(E_NOINTERFACE);
 }
 
-STDMETHODIMP_(ULONG) EmbedProviderFactory_Impl::AddRef()
+COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) EmbedProviderFactory_Impl::AddRef()
 {
     return osl_atomic_increment( &m_refCount);
 }
 
-STDMETHODIMP_(ULONG) EmbedProviderFactory_Impl::Release()
+COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) EmbedProviderFactory_Impl::Release()
 {
     ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex());
     sal_Int32 nCount = --m_refCount;
@@ -205,7 +205,7 @@ STDMETHODIMP_(ULONG) EmbedProviderFactory_Impl::Release()
     return nCount;
 }
 
-STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown FAR* punkOuter,
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown FAR* punkOuter,
                                                        REFIID riid,
                                                        void FAR* FAR* ppv)
 {
@@ -216,7 +216,7 @@ STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown FAR* punkOuter,
     return pEmbedDocument->QueryInterface( riid, ppv );
 }
 
-STDMETHODIMP EmbedProviderFactory_Impl::LockServer( int /*fLock*/ )
+COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::LockServer( int /*fLock*/ )
 {
     return NOERROR;
 }