diff options
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/ole/unoobjw.cxx | 4 | ||||
-rw-r--r-- | extensions/source/scanner/scanwin.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index a6cd0677d6ae..21debd9f54cc 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -1502,7 +1502,7 @@ Any SAL_CALL InterfaceOleWrapper::createBridge(const Any& modelDepObject, if( pVar) { pVar->vt= VT_DISPATCH; - pVar->pdispVal= static_cast<IDispatch*>( this); + pVar->pdispVal= this; AddRef(); retAny<<= reinterpret_cast< sal_uIntPtr >( pVar); @@ -2763,7 +2763,7 @@ HRESULT InterfaceOleWrapper::InvokeGeneral( DISPID dispidMember, unsigned short if( m_defaultValueType == VT_DISPATCH) { pvarResult->vt= VT_DISPATCH; - pvarResult->pdispVal= static_cast<IDispatch*>( this); + pvarResult->pdispVal= this; AddRef(); ret= S_OK; } diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index bfe4c3c37006..109f2944a3b5 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -342,7 +342,7 @@ bool Twain::InitializeNewShim(ScannerManager& rMgr, const VclPtr<vcl::Window>& x return false; // Have a shim for another task already! // hold reference to ScannerManager, to prevent premature death - mxMgr.set(static_cast<OWeakObject*>(mpCurMgr = &rMgr), css::uno::UNO_QUERY); + mxMgr = mpCurMgr = &rMgr; mpThread.set(new ShimListenerThread(xTopWindow)); mpThread->launch(); |