diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-01 16:19:32 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-02 08:18:57 +0200 |
| commit | 38ee6b2ad540c0d5cc0182396787d4c7625ea064 (patch) | |
| tree | 9980898ba49c225d0a851a60bf97d276e07f4220 /embedserv/source/embed/ed_iinplace.cxx | |
| parent | 4d45df2632dddde3d8e34315c8ee76575587a62a (diff) | |
-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>
Diffstat (limited to 'embedserv/source/embed/ed_iinplace.cxx')
| -rw-r--r-- | embedserv/source/embed/ed_iinplace.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
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; } |