[Libreoffice-commits] core.git: extensions/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 25 13:32:07 UTC 2021
extensions/source/ole/servprov.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit c97eba19ebf8e94da290869f429316f80d2b21b7
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jun 25 10:41:27 2021 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jun 25 15:31:28 2021 +0200
-Werror,-Wunused-but-set-parameter (clang-cl 13 trunk)
...ever since 95117e7fefa9ae82431dcdffd1e58495730f6f54 "initial import"
Change-Id: I7088801e9ad1e5190c127d01c640ded0a2b0c9d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117846
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 8fc03c256d96..ea69be1d9fe2 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -137,7 +137,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) OneInstanceOleWrapper::Release()
return refCount;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown* punkOuter,
+COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown*,
REFIID riid, void** ppv)
{
comphelper::Automation::AutomationInvokedZone aAutomationActive;
@@ -145,7 +145,6 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown
SAL_INFO("extensions.olebridge", "OneInstanceOleWrapper::CreateInstance(" << riid << ")");
HRESULT ret = ResultFromScode(E_UNEXPECTED);
- punkOuter = nullptr;
const Reference<XInterface>& xInst = m_xInstFunction();
if (xInst.is())
More information about the Libreoffice-commits
mailing list