summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/activex/SOActiveX.cxx10
-rw-r--r--extensions/source/activex/SODispatchInterceptor.cxx17
-rw-r--r--extensions/source/ole/servprov.cxx5
-rw-r--r--extensions/source/ole/servprov.hxx2
4 files changed, 16 insertions, 18 deletions
diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx
index 5b387bc2beef..6e102cf51202 100644
--- a/extensions/source/activex/SOActiveX.cxx
+++ b/extensions/source/activex/SOActiveX.cxx
@@ -223,7 +223,7 @@ HRESULT CSOActiveX::Cleanup()
pDispDocumentCloser );
if ( SUCCEEDED( hr ) && pDispDocumentCloser )
{
- SAFEARRAY FAR* pInitFrame = SafeArrayCreateVector( VT_VARIANT, 0, 1 );
+ SAFEARRAY* pInitFrame = SafeArrayCreateVector(VT_VARIANT, 0, 1);
LONG nInitInd = 0;
CComVariant pFrameVariant( mpDispFrame );
SafeArrayPutElement( pInitFrame, &nInitInd, &pFrameVariant );
@@ -590,7 +590,7 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height )
hr = GetIDispByFunc( mpDispFactory, L"createInstance", &aServiceName, 1, mpInstanceLocker );
if( SUCCEEDED( hr ) && mpInstanceLocker )
{
- SAFEARRAY FAR* pInitVals = SafeArrayCreateVector( VT_VARIANT, 0, 3 );
+ SAFEARRAY* pInitVals = SafeArrayCreateVector(VT_VARIANT, 0, 3);
// the first sequence element
LONG nInitInd = 0;
@@ -631,7 +631,7 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height )
HRESULT CSOActiveX::CallLoadComponentFromURL1PBool( OLECHAR const * sUrl, OLECHAR const * sArgName, BOOL sArgVal )
{
- SAFEARRAY FAR* pPropVals = SafeArrayCreateVector( VT_DISPATCH, 0, 1 );
+ SAFEARRAY* pPropVals = SafeArrayCreateVector(VT_DISPATCH, 0, 1);
LONG ix = 0;
CComPtr<IDispatch> pdispPropVal;
HRESULT hr = GetUnoStruct( L"com.sun.star.beans.PropertyValue", pdispPropVal );
@@ -681,7 +681,7 @@ HRESULT CSOActiveX::CallDispatchMethod( OLECHAR const * sUrl,
pdispXDispatch );
if( !SUCCEEDED( hr ) ) return hr;
- SAFEARRAY FAR* pPropVals = SafeArrayCreateVector( VT_DISPATCH, 0, count );
+ SAFEARRAY* pPropVals = SafeArrayCreateVector(VT_DISPATCH, 0, count);
for( LONG ix = 0; ix < static_cast<LONG>(count); ix ++ )
{
CComPtr<IDispatch> pdispPropVal;
@@ -740,7 +740,7 @@ void CSOActiveX::CallbackCreateXInputStream( CBindStatusCallback<CSOActiveX>* /*
if( SUCCEEDED( hr ) && mpDispTempFile )
{
- SAFEARRAY FAR* pDataArray = SafeArrayCreateVector( VT_I1, 0, dwSize );
+ SAFEARRAY* pDataArray = SafeArrayCreateVector(VT_I1, 0, dwSize);
if ( pDataArray )
{
diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx
index f5497fc0efdd..f40f6263512d 100644
--- a/extensions/source/activex/SODispatchInterceptor.cxx
+++ b/extensions/source/activex/SODispatchInterceptor.cxx
@@ -58,10 +58,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorI
return S_FALSE;
}
-STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL,
- BSTR aTargetFrameName,
- long nSearchFlags,
- IDispatch FAR* FAR* retVal )
+STDMETHODIMP SODispatchInterceptor::queryDispatch(IDispatch* aURL, BSTR aTargetFrameName,
+ long nSearchFlags, IDispatch** retVal)
{
if ( !aURL || !retVal ) return E_FAIL;
@@ -116,7 +114,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL,
return S_OK;
}
-STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts, SAFEARRAY FAR* FAR* retVal)
+STDMETHODIMP SODispatchInterceptor::queryDispatches(SAFEARRAY* aDescripts, SAFEARRAY** retVal)
{
if ( !aDescripts || !retVal || SafeArrayGetDim( aDescripts ) != 1 )
return E_FAIL;
@@ -156,7 +154,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts,
}
-STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR* aArgs)
+STDMETHODIMP SODispatchInterceptor::dispatch(IDispatch* aURL, SAFEARRAY* aArgs)
{
// get url from aURL
OLECHAR const * pUrlName = L"Complete";
@@ -211,19 +209,20 @@ STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR
return S_OK;
}
-STDMETHODIMP SODispatchInterceptor::addStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/)
+STDMETHODIMP SODispatchInterceptor::addStatusListener(IDispatch* /*xControl*/, IDispatch* /*aURL*/)
{
// not implemented
return S_OK;
}
-STDMETHODIMP SODispatchInterceptor::removeStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/)
+STDMETHODIMP SODispatchInterceptor::removeStatusListener(IDispatch* /*xControl*/,
+ IDispatch* /*aURL*/)
{
// not implemented
return S_OK;
}
-STDMETHODIMP SODispatchInterceptor::getInterceptedURLs( SAFEARRAY FAR* FAR* pVal )
+STDMETHODIMP SODispatchInterceptor::getInterceptedURLs(SAFEARRAY** pVal)
{
*pVal = SafeArrayCreateVector( VT_BSTR, 0, 3 );
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 1f14fa01032d..8fc03c256d96 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -137,9 +137,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) OneInstanceOleWrapper::Release()
return refCount;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown FAR* punkOuter,
- REFIID riid,
- void FAR* FAR* ppv)
+COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown* punkOuter,
+ REFIID riid, void** ppv)
{
comphelper::Automation::AutomationInvokedZone aAutomationActive;
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 57debb03779a..b3194c415332 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -70,7 +70,7 @@ public:
STDMETHOD_(ULONG, Release)() override;
/* IClassFactory methods */
- STDMETHOD(CreateInstance)(IUnknown FAR* punkOuter, REFIID riid, void FAR* FAR* ppv) override;
+ STDMETHOD(CreateInstance)(IUnknown* punkOuter, REFIID riid, void** ppv) override;
STDMETHOD(LockServer)(BOOL fLock) override;
protected:
generated by cgit (git 2.34.1) at 2024-06-02 14:28:14 +0000