View | Details | Raw Unified | Return to issue 81612
Collapse All | Expand All

(-)jscriptclasses.cxx (-22 / +22 lines)
Lines 50-73 Link Here
50
50
51
51
52
// JScriptValue, IDispatch --------------------------------------------
52
// JScriptValue, IDispatch --------------------------------------------
53
STDMETHODIMP JScriptValue::GetTypeInfoCount(UINT *pctinfo)
53
STDMETHODIMP JScriptValue::GetTypeInfoCount(UINT* /*pctinfo*/)
54
{
54
{
55
	return E_NOTIMPL;
55
	return E_NOTIMPL;
56
}
56
}
57
57
58
// JScriptValue, IDispatch --------------------------------------------
58
// JScriptValue, IDispatch --------------------------------------------
59
STDMETHODIMP JScriptValue::GetTypeInfo( UINT iTInfo,
59
STDMETHODIMP JScriptValue::GetTypeInfo( UINT /*iTInfo*/,
60
										   LCID lcid,
60
										   LCID /*lcid*/,
61
										   ITypeInfo **ppTInfo)
61
										   ITypeInfo** /*ppTInfo*/)
62
{
62
{
63
	return E_NOTIMPL;
63
	return E_NOTIMPL;
64
}
64
}
65
65
66
// JScriptValue, IDispatch --------------------------------------------
66
// JScriptValue, IDispatch --------------------------------------------
67
STDMETHODIMP JScriptValue::GetIDsOfNames( REFIID riid,
67
STDMETHODIMP JScriptValue::GetIDsOfNames( REFIID /*riid*/,
68
											 LPOLESTR *rgszNames,
68
											 LPOLESTR *rgszNames,
69
											 UINT cNames,			
69
											 UINT /*cNames*/,			
70
											 LCID lcid,
70
											 LCID /*lcid*/,
71
											 DISPID *rgDispId)
71
											 DISPID *rgDispId)
72
{
72
{
73
	if( !rgDispId)
73
	if( !rgDispId)
Lines 94-106 Link Here
94
94
95
// JScriptValue, IDispatch --------------------------------------------
95
// JScriptValue, IDispatch --------------------------------------------
96
STDMETHODIMP JScriptValue::Invoke( DISPID dispIdMember,
96
STDMETHODIMP JScriptValue::Invoke( DISPID dispIdMember,
97
						 REFIID riid,
97
						 REFIID /*riid*/,
98
						 LCID lcid,
98
						 LCID /*lcid*/,
99
						 WORD wFlags,
99
						 WORD wFlags,
100
						 DISPPARAMS *pDispParams,
100
						 DISPPARAMS *pDispParams,
101
						 VARIANT *pVarResult,
101
						 VARIANT *pVarResult,
102
						 EXCEPINFO *pExcepInfo,
102
						 EXCEPINFO* /*pExcepInfo*/,
103
						 UINT *puArgErr)
103
						 UINT* /*puArgErr*/)
104
{
104
{
105
	if( pDispParams->cNamedArgs)
105
	if( pDispParams->cNamedArgs)
106
		return DISP_E_NONAMEDARGS;
106
		return DISP_E_NONAMEDARGS;
Lines 240-263 Link Here
240
240
241
241
242
// JScriptOutParam, IDispatch --------------------------------------------
242
// JScriptOutParam, IDispatch --------------------------------------------
243
STDMETHODIMP JScriptOutParam::GetTypeInfoCount(UINT *pctinfo)
243
STDMETHODIMP JScriptOutParam::GetTypeInfoCount(UINT* /*pctinfo*/)
244
{
244
{
245
	return E_NOTIMPL;
245
	return E_NOTIMPL;
246
}
246
}
247
247
248
// JScriptOutParam, IDispatch --------------------------------------------
248
// JScriptOutParam, IDispatch --------------------------------------------
249
STDMETHODIMP JScriptOutParam::GetTypeInfo( UINT iTInfo,
249
STDMETHODIMP JScriptOutParam::GetTypeInfo( UINT /*iTInfo*/,
250
										   LCID lcid,
250
										   LCID /*lcid*/,
251
										   ITypeInfo **ppTInfo)
251
										   ITypeInfo** /*ppTInfo*/)
252
{
252
{
253
	return E_NOTIMPL;
253
	return E_NOTIMPL;
254
}
254
}
255
255
256
// JScriptOutParam, IDispatch --------------------------------------------
256
// JScriptOutParam, IDispatch --------------------------------------------
257
STDMETHODIMP JScriptOutParam::GetIDsOfNames( REFIID riid,
257
STDMETHODIMP JScriptOutParam::GetIDsOfNames( REFIID /*riid*/,
258
											 LPOLESTR *rgszNames,
258
											 LPOLESTR *rgszNames,
259
											 UINT cNames,			
259
											 UINT /*cNames*/,			
260
											 LCID lcid,
260
											 LCID /*lcid*/,
261
											 DISPID *rgDispId)
261
											 DISPID *rgDispId)
262
{
262
{
263
	if( !rgDispId)
263
	if( !rgDispId)
Lines 278-290 Link Here
278
278
279
// JScriptOutParam, IDispatch --------------------------------------------
279
// JScriptOutParam, IDispatch --------------------------------------------
280
STDMETHODIMP JScriptOutParam::Invoke( DISPID dispIdMember,
280
STDMETHODIMP JScriptOutParam::Invoke( DISPID dispIdMember,
281
						 REFIID riid,
281
						 REFIID /*riid*/,
282
						 LCID lcid,
282
						 LCID /*lcid*/,
283
						 WORD wFlags,
283
						 WORD wFlags,
284
						 DISPPARAMS *pDispParams,
284
						 DISPPARAMS *pDispParams,
285
						 VARIANT *pVarResult,
285
						 VARIANT *pVarResult,
286
						 EXCEPINFO *pExcepInfo,
286
						 EXCEPINFO* /*pExcepInfo*/,
287
						 UINT *puArgErr)
287
						 UINT* /*puArgErr*/)
288
{
288
{
289
	HRESULT ret= S_OK; 
289
	HRESULT ret= S_OK; 
290
	switch( dispIdMember)
290
	switch( dispIdMember)
(-)jscriptclasses.hxx (+1 lines)
Lines 34-39 Link Here
34
 ************************************************************************/
34
 ************************************************************************/
35
#ifndef __JSCRIPTCLASSES_HXX
35
#ifndef __JSCRIPTCLASSES_HXX
36
#define __JSCRIPTCLASSES_HXX
36
#define __JSCRIPTCLASSES_HXX
37
37
#include <tools/presys.h>
38
#include <tools/presys.h>
38
//#include "stdafx.h"
39
//#include "stdafx.h"
39
#define STRICT
40
#define STRICT
(-)ole2uno.hxx (+6 lines)
Lines 51-56 Link Here
51
//#define _ATL_DEBUG_INTERFACES
51
//#define _ATL_DEBUG_INTERFACES
52
#endif
52
#endif
53
53
54
#pragma warning (push,1)
55
#pragma warning (disable:4917)
56
#pragma warning (disable:4005)
57
54
#include <tools/prewin.h>
58
#include <tools/prewin.h>
55
#include <tchar.h>
59
#include <tchar.h>
56
#if (_MSC_VER >= 1200) || defined(__MINGW32__)
60
#if (_MSC_VER >= 1200) || defined(__MINGW32__)
Lines 62-67 Link Here
62
#include <list>
66
#include <list>
63
#include <tools/postsys.h>
67
#include <tools/postsys.h>
64
68
69
#pragma warning (pop)
70
65
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
71
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
66
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
72
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
67
#endif
73
#endif
(-)oleobjw.cxx (-24 / +22 lines)
Lines 356-362 Link Here
356
        // convert the uno argument
356
        // convert the uno argument
357
        if (vt & VT_BYREF)
357
        if (vt & VT_BYREF)
358
        {
358
        {
359
            anyToVariant( & varRefArg, aValue, vt ^ VT_BYREF);
359
            anyToVariant( & varRefArg, aValue, ::sal::static_int_cast< VARTYPE, int >( vt ^ VT_BYREF ) );
360
            varArg.vt = vt;
360
            varArg.vt = vt;
361
            if( (vt & VT_TYPEMASK) == VT_VARIANT)
361
            if( (vt & VT_TYPEMASK) == VT_VARIANT)
362
                varArg.byref = & varRefArg;
362
                varArg.byref = & varRefArg;
Lines 370-376 Link Here
370
            anyToVariant(& varArg, aValue, vt);
370
            anyToVariant(& varArg, aValue, vt);
371
        }
371
        }
372
        // call to IDispatch
372
        // call to IDispatch
373
        hr = m_spDispatch->Invoke(dispid, IID_NULL, LOCALE_USER_DEFAULT, invkind,
373
        hr = m_spDispatch->Invoke(dispid, IID_NULL, LOCALE_USER_DEFAULT, (WORD)invkind,
374
                                 &dispparams, & varResult, & excepinfo, &uArgErr);
374
                                 &dispparams, & varResult, & excepinfo, &uArgErr);
375
   	
375
   	
376
        // lookup error code			
376
        // lookup error code			
Lines 399-405 Link Here
399
			break;
399
			break;
400
		case DISP_E_PARAMNOTFOUND:
400
		case DISP_E_PARAMNOTFOUND:
401
			throw IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
401
			throw IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
402
                                               static_cast<XWeak*>(this)), uArgErr) ;
402
                                               static_cast<XWeak*>(this)), (sal_Int16)uArgErr) ;
403
			break;
403
			break;
404
		case DISP_E_TYPEMISMATCH:
404
		case DISP_E_TYPEMISMATCH:
405
			throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
405
			throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
Lines 689-695 Link Here
689
}
689
}
690
690
691
Any SAL_CALL IUnknownWrapper_Impl::createBridge( const Any& modelDepObject,
691
Any SAL_CALL IUnknownWrapper_Impl::createBridge( const Any& modelDepObject,
692
				const Sequence< sal_Int8 >& aProcessId, sal_Int16 sourceModelType,
692
				const Sequence< sal_Int8 >& /*aProcessId*/, sal_Int16 sourceModelType,
693
				 sal_Int16 destModelType )
693
				 sal_Int16 destModelType )
694
	throw( IllegalArgumentException, RuntimeException)
694
	throw( IllegalArgumentException, RuntimeException)
695
{
695
{
Lines 928-934 Link Here
928
			} 
928
			} 
929
			catch (IllegalArgumentException & e)
929
			catch (IllegalArgumentException & e)
930
			{
930
			{
931
				e.ArgumentPosition = i;
931
				e.ArgumentPosition = (sal_Int16)i;
932
				throw;
932
				throw;
933
			}
933
			}
934
			catch (CannotConvertException & e)
934
			catch (CannotConvertException & e)
Lines 994-1000 Link Here
994
			}
994
			}
995
			catch (IllegalArgumentException & e)
995
			catch (IllegalArgumentException & e)
996
			{
996
			{
997
				e.ArgumentPosition = i;
997
				e.ArgumentPosition = (sal_Int16)i;
998
				throw;
998
				throw;
999
			}
999
			}
1000
			catch (CannotConvertException & e)
1000
			catch (CannotConvertException & e)
Lines 1056-1062 Link Here
1056
						}
1056
						}
1057
						else //JScriptObject
1057
						else //JScriptObject
1058
						{
1058
						{
1059
							if( pVarParams[i].vt= VT_DISPATCH)
1059
							if( pVarParams[i].vt == VT_DISPATCH)
1060
							{
1060
							{
1061
								CComDispatchDriver pDisp( pVarParams[i].pdispVal);
1061
								CComDispatchDriver pDisp( pVarParams[i].pdispVal);
1062
								if( pDisp)
1062
								if( pDisp)
Lines 1083-1089 Link Here
1083
			}
1083
			}
1084
			catch(IllegalArgumentException & e)
1084
			catch(IllegalArgumentException & e)
1085
			{
1085
			{
1086
				e.ArgumentPosition = i;
1086
				e.ArgumentPosition = (sal_Int16)i;
1087
				throw;
1087
				throw;
1088
			}
1088
			}
1089
			catch(CannotConvertException & e)
1089
			catch(CannotConvertException & e)
Lines 1149-1155 Link Here
1149
        break;
1149
        break;
1150
    case DISP_E_PARAMNOTFOUND:
1150
    case DISP_E_PARAMNOTFOUND:
1151
        throw IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
1151
        throw IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")), static_cast<XInterface*>(
1152
                                           static_cast<XWeak*>(this)), uArgErr);
1152
                                           static_cast<XWeak*>(this)), (sal_Int16)uArgErr);
1153
        break;
1153
        break;
1154
    case DISP_E_TYPEMISMATCH:
1154
    case DISP_E_TYPEMISMATCH:
1155
        throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")),static_cast<XInterface*>(
1155
        throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("call to OLE object failed")),static_cast<XInterface*>(
Lines 1182-1188 Link Here
1182
	// 1.parameter is IUnknown
1182
	// 1.parameter is IUnknown
1183
	// 2.parameter is a boolean which indicates if the the COM pointer was a IUnknown or IDispatch
1183
	// 2.parameter is a boolean which indicates if the the COM pointer was a IUnknown or IDispatch
1184
	// 3.parameter is a Sequence<Type> 
1184
	// 3.parameter is a Sequence<Type> 
1185
	HRESULT result;
1186
	o2u_attachCurrentThread();
1185
	o2u_attachCurrentThread();
1187
	OSL_ASSERT(aArguments.getLength() == 3);
1186
	OSL_ASSERT(aArguments.getLength() == 3);
1188
    
1187
    
Lines 1394-1400 Link Here
1394
    }
1393
    }
1395
1394
1396
	//check if there are not to many arguments supplied
1395
	//check if there are not to many arguments supplied
1397
	if (nUnoArgs > dispparams.cArgs)
1396
	if ((sal_uInt32)nUnoArgs > dispparams.cArgs)
1398
	{
1397
	{
1399
	    OUStringBuffer buf(256);
1398
	    OUStringBuffer buf(256);
1400
        buf.appendAscii("[automation bridge] There are too many arguments for this method");
1399
        buf.appendAscii("[automation bridge] There are too many arguments for this method");
Lines 1428-1434 Link Here
1428
        arNames[0] = const_cast<OLECHAR*>(reinterpret_cast<LPCOLESTR>(sFuncName.getStr()));
1427
        arNames[0] = const_cast<OLECHAR*>(reinterpret_cast<LPCOLESTR>(sFuncName.getStr()));
1429
1428
1430
        int cNamedArg = 0;
1429
        int cNamedArg = 0;
1431
        for (int iParams = 0; iParams < dispparams.cArgs; iParams ++)
1430
        for (size_t iParams = 0; iParams < dispparams.cArgs; iParams ++)
1432
        {
1431
        {
1433
            const Any &  curArg = Params[iParams];
1432
            const Any &  curArg = Params[iParams];
1434
            if (curArg.getValueType() == getCppuType((NamedArgument*) 0))
1433
            if (curArg.getValueType() == getCppuType((NamedArgument*) 0))
Lines 1563-1569 Link Here
1563
			if (paramFlags & PARAMFLAG_FOUT &&
1562
			if (paramFlags & PARAMFLAG_FOUT &&
1564
				! (paramFlags & PARAMFLAG_FIN)  )
1563
				! (paramFlags & PARAMFLAG_FIN)  )
1565
			{
1564
			{
1566
				VARTYPE type= varType ^ VT_BYREF;
1565
                VARTYPE type = ::sal::static_int_cast< VARTYPE, int >( varType ^ VT_BYREF );
1567
				if (i < nUnoArgs)
1566
				if (i < nUnoArgs)
1568
				{
1567
				{
1569
					arRefArgs[revIndex].vt= type;                    
1568
					arRefArgs[revIndex].vt= type;                    
Lines 1591-1597 Link Here
1591
			// in/out  + in byref params
1590
			// in/out  + in byref params
1592
			else if (varType & VT_BYREF)
1591
			else if (varType & VT_BYREF)
1593
			{
1592
			{
1594
				VARTYPE type = varType ^ VT_BYREF;
1593
                VARTYPE type = ::sal::static_int_cast< VARTYPE, int >( varType ^ VT_BYREF );
1595
				CComVariant var;
1594
				CComVariant var;
1596
1595
1597
				if (i < nUnoArgs && anyArg.getValueTypeClass() != TypeClass_VOID)
1596
				if (i < nUnoArgs && anyArg.getValueTypeClass() != TypeClass_VOID)
Lines 1636-1642 Link Here
1636
				else
1635
				else
1637
				{
1636
				{
1638
					arArgs[revIndex].byref = & arRefArgs[revIndex].byref;
1637
					arArgs[revIndex].byref = & arRefArgs[revIndex].byref;
1639
					arArgs[revIndex].vt = arRefArgs[revIndex].vt | VT_BYREF;
1638
                    arArgs[revIndex].vt = ::sal::static_int_cast< VARTYPE, int >( arRefArgs[revIndex].vt | VT_BYREF );
1640
				}
1639
				}
1641
1640
1642
			}
1641
			}
Lines 1667-1673 Link Here
1667
	}	
1666
	}	
1668
    catch (IllegalArgumentException & e)
1667
    catch (IllegalArgumentException & e)
1669
	{
1668
	{
1670
		e.ArgumentPosition = i;
1669
		e.ArgumentPosition = (sal_Int16)i;
1671
		throw;
1670
		throw;
1672
	}
1671
	}
1673
	catch (CannotConvertException & e)
1672
	catch (CannotConvertException & e)
Lines 1681-1687 Link Here
1681
	result = m_spDispatch->Invoke(aFuncDesc->memid, 
1680
	result = m_spDispatch->Invoke(aFuncDesc->memid, 
1682
								 IID_NULL,
1681
								 IID_NULL,
1683
								 localeId, 
1682
								 localeId, 
1684
								 aFuncDesc->invkind,
1683
								 (WORD)aFuncDesc->invkind,
1685
								 &dispparams, 
1684
								 &dispparams, 
1686
								 &varResult, 
1685
								 &varResult, 
1687
								 &excepinfo,
1686
								 &excepinfo,
Lines 1733-1739 Link Here
1733
				}
1732
				}
1734
				catch (IllegalArgumentException & e)
1733
				catch (IllegalArgumentException & e)
1735
				{
1734
				{
1736
					e.ArgumentPosition = paramIndex;
1735
					e.ArgumentPosition = (sal_Int16)paramIndex;
1737
					throw;
1736
					throw;
1738
				}
1737
				}
1739
				catch (CannotConvertException & e)
1738
				catch (CannotConvertException & e)
Lines 1742-1748 Link Here
1742
					throw;
1741
					throw;
1743
				}
1742
				}
1744
                OutParam[outParamIndex] = outAny;
1743
                OutParam[outParamIndex] = outAny;
1745
                OutParamIndex[outParamIndex] = paramIndex;
1744
                OutParamIndex[outParamIndex] = (sal_Int16)paramIndex;
1746
                outParamIndex++;
1745
                outParamIndex++;
1747
            }   
1746
            }   
1748
            OutParam.realloc(outParamIndex);
1747
            OutParam.realloc(outParamIndex);
Lines 1782-1788 Link Here
1782
			break;
1781
			break;
1783
		case DISP_E_NONAMEDARGS:           
1782
		case DISP_E_NONAMEDARGS:           
1784
			throw IllegalArgumentException(OUSTR("[automation bridge] Object "
1783
			throw IllegalArgumentException(OUSTR("[automation bridge] Object "
1785
                  "returned DISP_E_NONAMEDARGS"),0, uArgErr);
1784
                  "returned DISP_E_NONAMEDARGS"),0, (sal_Int16)uArgErr);
1786
			break;
1785
			break;
1787
		case DISP_E_OVERFLOW:
1786
		case DISP_E_OVERFLOW:
1788
			throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")),
1787
			throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")),
Lines 1792-1798 Link Here
1792
		case DISP_E_PARAMNOTFOUND:
1791
		case DISP_E_PARAMNOTFOUND:
1793
			throw IllegalArgumentException(OUSTR("[automation bridge]Call failed."
1792
			throw IllegalArgumentException(OUSTR("[automation bridge]Call failed."
1794
                                                 "Object returned DISP_E_PARAMNOTFOUND."),
1793
                                                 "Object returned DISP_E_PARAMNOTFOUND."),
1795
                                           0, uArgErr); 
1794
                                           0, (sal_Int16)uArgErr); 
1796
			break;
1795
			break;
1797
		case DISP_E_TYPEMISMATCH:
1796
		case DISP_E_TYPEMISMATCH:
1798
			throw CannotConvertException(OUSTR("[automation bridge] Call  failed. "
1797
			throw CannotConvertException(OUSTR("[automation bridge] Call  failed. "
Lines 2019-2025 Link Here
2019
2018
2020
VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc)
2019
VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc)
2021
{
2020
{
2022
	VARTYPE _type;
2021
	VARTYPE _type( VT_NULL );
2023
2022
2024
	if (desc->vt == VT_PTR)
2023
	if (desc->vt == VT_PTR)
2025
	{
2024
	{
Lines 2157-2163 Link Here
2157
2156
2158
ITypeInfo* IUnknownWrapper_Impl::getTypeInfo()
2157
ITypeInfo* IUnknownWrapper_Impl::getTypeInfo()
2159
{
2158
{
2160
	HRESULT hr= S_OK;
2161
	if( !m_spDispatch)
2159
	if( !m_spDispatch)
2162
    {
2160
    {
2163
        throw BridgeRuntimeError(OUSTR("The object has no IDispatch interface!"));
2161
        throw BridgeRuntimeError(OUSTR("The object has no IDispatch interface!"));
Lines 2183-2189 Link Here
2183
							typeAttr->wTypeFlags & TYPEFLAG_FDUAL)	
2181
							typeAttr->wTypeFlags & TYPEFLAG_FDUAL)	
2184
					{
2182
					{
2185
						HREFTYPE refDispatch;
2183
						HREFTYPE refDispatch;
2186
						if (SUCCEEDED(spType->GetRefTypeOfImplType(-1, &refDispatch)))
2184
						if (SUCCEEDED(spType->GetRefTypeOfImplType((UINT)-1, &refDispatch)))
2187
						{
2185
						{
2188
							CComPtr<ITypeInfo> spTypeDisp;
2186
							CComPtr<ITypeInfo> spTypeDisp;
2189
							if (SUCCEEDED(spType->GetRefTypeInfo(refDispatch, & spTypeDisp)))
2187
							if (SUCCEEDED(spType->GetRefTypeInfo(refDispatch, & spTypeDisp)))
(-)olethread.cxx (-1 / +1 lines)
Lines 60-66 Link Here
60
{
60
{
61
	static OThreadData oleThreadData;
61
	static OThreadData oleThreadData;
62
	
62
	
63
	if ((sal_Bool)oleThreadData.getData() != sal_True)
63
    if ((sal_Bool)(sal_IntPtr)oleThreadData.getData() != sal_True)
64
	{
64
	{
65
		HINSTANCE inst=	LoadLibrary( _T("ole32.dll"));
65
		HINSTANCE inst=	LoadLibrary( _T("ole32.dll"));
66
		if( inst )
66
		if( inst )
(-)servprov.cxx (-7 / +4 lines)
Lines 221-227 Link Here
221
	return ret;
221
	return ret;
222
}
222
}
223
223
224
STDMETHODIMP ProviderOleWrapper_Impl::LockServer(int fLock)
224
STDMETHODIMP ProviderOleWrapper_Impl::LockServer(int /*fLock*/)
225
{
225
{
226
    return NOERROR;
226
    return NOERROR;
227
}
227
}
Lines 359-365 Link Here
359
	return ret;
359
	return ret;
360
}
360
}
361
361
362
STDMETHODIMP OneInstanceOleWrapper_Impl::LockServer(int fLock)
362
STDMETHODIMP OneInstanceOleWrapper_Impl::LockServer(int /*fLock*/)
363
{
363
{
364
    return NOERROR;
364
    return NOERROR;
365
}
365
}
Lines 611-617 Link Here
611
	return ret;
611
	return ret;
612
}
612
}
613
613
614
Reference<XInterface> SAL_CALL OleClient_Impl::createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& Arguments) throw (Exception, RuntimeException)
614
Reference<XInterface> SAL_CALL OleClient_Impl::createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/) throw (Exception, RuntimeException)
615
{
615
{
616
	return createInstance( ServiceSpecifier);
616
	return createInstance( ServiceSpecifier);
617
}
617
}
Lines 670-675 Link Here
670
	sal_Bool bOLERegister = sal_True;
670
	sal_Bool bOLERegister = sal_True;
671
#endif	
671
#endif	
672
	sal_Bool ret = provideInstance( m_smgr, (GUID*)&OID_ServiceManager, bOLERegister );
672
	sal_Bool ret = provideInstance( m_smgr, (GUID*)&OID_ServiceManager, bOLERegister );
673
    (void)ret;
673
}
674
}
674
675
675
OleServer_Impl::~OleServer_Impl()
676
OleServer_Impl::~OleServer_Impl()
Lines 737-744 Link Here
737
738
738
sal_Bool OleServer_Impl::provideService(const Reference<XSingleServiceFactory>& xSFact, GUID* guid)
739
sal_Bool OleServer_Impl::provideService(const Reference<XSingleServiceFactory>& xSFact, GUID* guid)
739
{
740
{
740
	sal_Bool ret = FALSE;
741
742
	IClassFactoryWrapper* pFac = new ProviderOleWrapper_Impl( m_smgr, xSFact, guid);
741
	IClassFactoryWrapper* pFac = new ProviderOleWrapper_Impl( m_smgr, xSFact, guid);
743
742
744
	pFac->AddRef();
743
	pFac->AddRef();
Lines 750-757 Link Here
750
749
751
sal_Bool OleServer_Impl::provideInstance(const Reference<XInterface>& xInst, GUID* guid, sal_Bool bAsApplication )
750
sal_Bool OleServer_Impl::provideInstance(const Reference<XInterface>& xInst, GUID* guid, sal_Bool bAsApplication )
752
{
751
{
753
	sal_Bool 	ret = FALSE;
754
755
	IClassFactoryWrapper* pFac = new OneInstanceOleWrapper_Impl( m_smgr, xInst, guid, bAsApplication );
752
	IClassFactoryWrapper* pFac = new OneInstanceOleWrapper_Impl( m_smgr, xInst, guid, bAsApplication );
756
753
757
	pFac->AddRef();
754
	pFac->AddRef();
(-)servprov.hxx (-2 / +2 lines)
Lines 101-107 Link Here
101
101
102
	ProviderOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr,
102
	ProviderOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr,
103
							 const Reference<XSingleServiceFactory>& xSFactory, GUID* pGuid);
103
							 const Reference<XSingleServiceFactory>& xSFactory, GUID* pGuid);
104
	~ProviderOleWrapper_Impl();
104
	virtual ~ProviderOleWrapper_Impl();
105
105
106
	sal_Bool registerClass();
106
	sal_Bool registerClass();
107
	sal_Bool deregisterClass();
107
	sal_Bool deregisterClass();
Lines 143-149 Link Here
143
public:
143
public:
144
144
145
	OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr, const Reference<XInterface>& xInst, GUID* pGuid, sal_Bool bAsApplication );
145
	OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr, const Reference<XInterface>& xInst, GUID* pGuid, sal_Bool bAsApplication );
146
	~OneInstanceOleWrapper_Impl();
146
	virtual ~OneInstanceOleWrapper_Impl();
147
147
148
	sal_Bool registerClass();
148
	sal_Bool registerClass();
149
	sal_Bool deregisterClass();
149
	sal_Bool deregisterClass();
(-)servreg.cxx (-3 / +3 lines)
Lines 85-91 Link Here
85
} // end namespace
85
} // end namespace
86
86
87
extern "C" void * SAL_CALL component_getFactory(
87
extern "C" void * SAL_CALL component_getFactory(
88
	const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
88
	const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
89
{
89
{
90
	void * pRet = 0;
90
	void * pRet = 0;
91
	
91
	
Lines 131-137 Link Here
131
}
131
}
132
132
133
133
134
extern "C" sal_Bool SAL_CALL component_writeInfo(	void * pServiceManager, void * pRegistryKey )
134
extern "C" sal_Bool SAL_CALL component_writeInfo(	void * /*pServiceManager*/, void * pRegistryKey )
135
{
135
{
136
	if (pRegistryKey)
136
	if (pRegistryKey)
137
	{
137
	{
Lines 173-179 Link Here
173
}
173
}
174
174
175
extern "C" void SAL_CALL component_getImplementationEnvironment(
175
extern "C" void SAL_CALL component_getImplementationEnvironment(
176
	const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
176
	const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
177
{
177
{
178
	*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
178
	*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
179
}
179
}
(-)unoconversionutilities.hxx (-6 / +5 lines)
Lines 126-131 Link Here
126
	UnoConversionUtilities( const Reference<XMultiServiceFactory> & xFactory, sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass )
126
	UnoConversionUtilities( const Reference<XMultiServiceFactory> & xFactory, sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass )
127
		: m_smgr( xFactory), m_nComWrapperClass( comWrapperClass), m_nUnoWrapperClass( unoWrapperClass)
127
		: m_smgr( xFactory), m_nComWrapperClass( comWrapperClass), m_nUnoWrapperClass( unoWrapperClass)
128
	{}
128
	{}
129
130
    virtual ~UnoConversionUtilities() {}
129
	/** converts only into oleautomation types, that is there is no VT_I1, VT_UI2, VT_UI4
131
	/** converts only into oleautomation types, that is there is no VT_I1, VT_UI2, VT_UI4
130
        a sal_Unicode character is converted into a BSTR.
132
        a sal_Unicode character is converted into a BSTR.
131
        @exception com.sun.star.lang.IllegalArgumentException
133
        @exception com.sun.star.lang.IllegalArgumentException
Lines 386-392 Link Here
386
                {
388
                {
387
                    if ((var.vt & VT_ARRAY) != 0)
389
                    if ((var.vt & VT_ARRAY) != 0)
388
                    {
390
                    {
389
                        VARTYPE oleType = var.vt ^ VT_ARRAY;
391
                        VARTYPE oleType = ::sal::static_int_cast< VARTYPE, int >( var.vt ^ VT_ARRAY );
390
                        Sequence<Any> unoSeq = createOleArrayWrapper( var.parray, oleType, ptype);
392
                        Sequence<Any> unoSeq = createOleArrayWrapper( var.parray, oleType, ptype);
391
                        Reference<XTypeConverter> conv = getTypeConverter();
393
                        Reference<XTypeConverter> conv = getTypeConverter();
392
                        if (conv.is())
394
                        if (conv.is())
Lines 639-645 Link Here
639
            if( ar)
641
            if( ar)
640
            {
642
            {
641
                VariantClear( pVariant);
643
                VariantClear( pVariant);
642
                pVariant->vt= VT_ARRAY | type;
644
                pVariant->vt= ::sal::static_int_cast< VARTYPE, int >( VT_ARRAY | type );
643
                pVariant->byref= ar;
645
                pVariant->byref= ar;
644
            }
646
            }
645
        }
647
        }
Lines 707-713 Link Here
707
template<class T>
709
template<class T>
708
void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
710
void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
709
{
711
{
710
    bool bCannotConvert = false;
711
    bool bIllegal = false;
712
    bool bIllegal = false;
712
    try
713
    try
713
    {
714
    {
Lines 1067-1073 Link Here
1067
		// set up the SAFEARRAY
1068
		// set up the SAFEARRAY
1068
        scoped_array<SAFEARRAYBOUND> sarSafeArrayBound(new SAFEARRAYBOUND[dims]);
1069
        scoped_array<SAFEARRAYBOUND> sarSafeArrayBound(new SAFEARRAYBOUND[dims]);
1069
		SAFEARRAYBOUND* prgsabound= sarSafeArrayBound.get();
1070
		SAFEARRAYBOUND* prgsabound= sarSafeArrayBound.get();
1070
		sal_Int32 elementCount=0; //the number of all elements in the SAFEARRAY
1071
		for( sal_Int32 i=0; i < dims; i++)
1071
		for( sal_Int32 i=0; i < dims; i++)
1072
		{
1072
		{
1073
			//prgsabound[0] is the right most dimension
1073
			//prgsabound[0] is the right most dimension
Lines 1501-1507 Link Here
1501
        {
1501
        {
1502
            if ((var.vt & VT_ARRAY) > 0)
1502
            if ((var.vt & VT_ARRAY) > 0)
1503
            {
1503
            {
1504
                VARTYPE oleTypeFlags = var.vt ^ VT_ARRAY;
1504
                VARTYPE oleTypeFlags = ::sal::static_int_cast< VARTYPE, int >( var.vt ^ VT_ARRAY );
1505
                
1505
                
1506
                Sequence<Any> unoSeq = createOleArrayWrapper(var.parray, oleTypeFlags);
1506
                Sequence<Any> unoSeq = createOleArrayWrapper(var.parray, oleTypeFlags);
1507
                rAny.setValue( &unoSeq, getCppuType( &unoSeq));
1507
                rAny.setValue( &unoSeq, getCppuType( &unoSeq));
Lines 2101-2107 Link Here
2101
            }
2101
            }
2102
        } // else
2102
        } // else
2103
        result.Clear();
2103
        result.Clear();
2104
        uno_Sequence **pps= &p_uno_Seq;
2105
        anySeq.setValue( &p_uno_Seq, pDesc);
2104
        anySeq.setValue( &p_uno_Seq, pDesc);
2106
        uno_destructData( &p_uno_Seq, pDesc, cpp_release);
2105
        uno_destructData( &p_uno_Seq, pDesc, cpp_release);
2107
        typelib_typedescription_release( pDesc);
2106
        typelib_typedescription_release( pDesc);
(-)unoobjw.cxx (-38 / +38 lines)
Lines 238-257 Link Here
238
	return ret;
238
	return ret;
239
}
239
}
240
240
241
STDMETHODIMP InterfaceOleWrapper_Impl::GetTypeInfoCount( unsigned int * pctinfo )
241
STDMETHODIMP InterfaceOleWrapper_Impl::GetTypeInfoCount( unsigned int * /*pctinfo*/ )
242
{
242
{
243
	return E_NOTIMPL ;
243
	return E_NOTIMPL ;
244
}	
244
}	
245
245
246
STDMETHODIMP InterfaceOleWrapper_Impl::GetTypeInfo(unsigned int itinfo, LCID lcid, ITypeInfo ** pptinfo)
246
STDMETHODIMP InterfaceOleWrapper_Impl::GetTypeInfo(unsigned int /*itinfo*/, LCID /*lcid*/, ITypeInfo ** /*pptinfo*/)
247
{
247
{
248
	return E_NOTIMPL;
248
	return E_NOTIMPL;
249
}	
249
}	
250
250
251
STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID riid, 
251
STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/, 
252
													 OLECHAR ** rgszNames, 
252
													 OLECHAR ** rgszNames, 
253
													 unsigned int cNames,
253
													 unsigned int cNames,
254
													 LCID lcid, 
254
													 LCID /*lcid*/, 
255
													 DISPID * rgdispid )
255
													 DISPID * rgdispid )
256
{
256
{
257
    HRESULT ret = DISP_E_UNKNOWNNAME;
257
    HRESULT ret = DISP_E_UNKNOWNNAME;
Lines 390-396 Link Here
390
// VARIANT contains an VT_DISPATCH that is no JScriptValue than the type information
390
// VARIANT contains an VT_DISPATCH that is no JScriptValue than the type information
391
// is used to find out about the reqired type.
391
// is used to find out about the reqired type.
392
void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id,
392
void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id,
393
    unsigned short wFlags, DISPPARAMS* pdispparams, Sequence<Any>& rSeq)
393
    unsigned short /*wFlags*/, DISPPARAMS* pdispparams, Sequence<Any>& rSeq)
394
{
394
{
395
	HRESULT hr= S_OK;
395
	HRESULT hr= S_OK;
396
	sal_Int32 countArgs= pdispparams->cArgs;
396
	sal_Int32 countArgs= pdispparams->cArgs;
Lines 532-538 Link Here
532
// can bridged to IDispatch ( if destModelType == OLE). The IDispatch is
532
// can bridged to IDispatch ( if destModelType == OLE). The IDispatch is
533
// implemented by this class.
533
// implemented by this class.
534
Any SAL_CALL InterfaceOleWrapper_Impl::createBridge(const Any& modelDepObject, 
534
Any SAL_CALL InterfaceOleWrapper_Impl::createBridge(const Any& modelDepObject, 
535
								const Sequence<sal_Int8>& ProcessId, 
535
								const Sequence<sal_Int8>& /*ProcessId*/, 
536
								sal_Int16 sourceModelType, 
536
								sal_Int16 sourceModelType, 
537
								sal_Int16 destModelType) 
537
								sal_Int16 destModelType) 
538
			throw (IllegalArgumentException, RuntimeException)
538
			throw (IllegalArgumentException, RuntimeException)
Lines 854-861 Link Here
854
}		
854
}		
855
855
856
STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID dispidMember, 
856
STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID dispidMember, 
857
											  REFIID riid, 
857
											  REFIID /*riid*/, 
858
											  LCID lcid, 
858
											  LCID /*lcid*/, 
859
											  unsigned short wFlags,
859
											  unsigned short wFlags,
860
                     						  DISPPARAMS * pdispparams, 
860
                     						  DISPPARAMS * pdispparams, 
861
											  VARIANT * pvarResult, 
861
											  VARIANT * pvarResult, 
Lines 872-878 Link Here
872
        if( bHandled)
872
        if( bHandled)
873
            return ret;
873
            return ret;
874
874
875
        if ((dispidMember > 0) && (dispidMember <= m_MemberInfos.size()) && m_xInvocation.is())
875
        if ((dispidMember > 0) && ((size_t)dispidMember <= m_MemberInfos.size()) && m_xInvocation.is())
876
        {
876
        {
877
            MemberInfo d = m_MemberInfos[dispidMember - 1];
877
            MemberInfo d = m_MemberInfos[dispidMember - 1];
878
            DWORD flags = wFlags & d.flags;
878
            DWORD flags = wFlags & d.flags;
Lines 969-975 Link Here
969
            const INT16* pOutIndex = outIndex.getConstArray();
969
            const INT16* pOutIndex = outIndex.getConstArray();
970
            const Any* pOutParams = outParams.getConstArray();
970
            const Any* pOutParams = outParams.getConstArray();
971
            
971
            
972
            for (UINT32 i = 0; i < outIndex.getLength(); i++)
972
            for (sal_Int32 i = 0; i < outIndex.getLength(); i++)
973
            {
973
            {
974
                CComVariant variant;
974
                CComVariant variant;
975
                // Currently a Sequence is converted to an SafeArray of VARIANTs.
975
                // Currently a Sequence is converted to an SafeArray of VARIANTs.
Lines 1034-1040 Link Here
1034
	return ret;
1034
	return ret;
1035
}
1035
}
1036
1036
1037
HRESULT InterfaceOleWrapper_Impl::doGetProperty( DISPPARAMS * pdispparams, VARIANT * pvarResult, 
1037
HRESULT InterfaceOleWrapper_Impl::doGetProperty( DISPPARAMS * /*pdispparams*/, VARIANT * pvarResult, 
1038
												EXCEPINFO * pexcepinfo, OUString& name)
1038
												EXCEPINFO * pexcepinfo, OUString& name)
1039
{
1039
{
1040
	HRESULT ret= S_OK;
1040
	HRESULT ret= S_OK;
Lines 1073-1079 Link Here
1073
	return  ret;
1073
	return  ret;
1074
}
1074
}
1075
1075
1076
HRESULT InterfaceOleWrapper_Impl::doSetProperty( DISPPARAMS * pdispparams, VARIANT * pvarResult, 
1076
HRESULT InterfaceOleWrapper_Impl::doSetProperty( DISPPARAMS * /*pdispparams*/, VARIANT * /*pvarResult*/, 
1077
										EXCEPINFO * pexcepinfo, unsigned int * puArgErr, OUString& name, Sequence<Any> params)
1077
										EXCEPINFO * pexcepinfo, unsigned int * puArgErr, OUString& name, Sequence<Any> params)
1078
{
1078
{
1079
	HRESULT ret= S_OK;
1079
	HRESULT ret= S_OK;
Lines 1112-1118 Link Here
1112
1112
1113
HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned short wFlags,
1113
HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned short wFlags,
1114
	                     DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
1114
	                     DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
1115
	                     unsigned int * puArgErr, sal_Bool& bHandled)
1115
	                     unsigned int * /*puArgErr*/, sal_Bool& bHandled)
1116
{
1116
{
1117
	HRESULT ret= S_OK;
1117
	HRESULT ret= S_OK;
1118
    try
1118
    try
Lines 1241-1247 Link Here
1241
1241
1242
1242
1243
1243
1244
STDMETHODIMP InterfaceOleWrapper_Impl::GetDispID(BSTR bstrName, DWORD grfdex, DISPID __RPC_FAR *pid)
1244
STDMETHODIMP InterfaceOleWrapper_Impl::GetDispID(BSTR /*bstrName*/, DWORD /*grfdex*/, DISPID __RPC_FAR* /*pid*/)
1245
{
1245
{
1246
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1246
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1247
1247
Lines 1249-1261 Link Here
1249
}
1249
}
1250
1250
1251
STDMETHODIMP InterfaceOleWrapper_Impl::InvokeEx( 
1251
STDMETHODIMP InterfaceOleWrapper_Impl::InvokeEx( 
1252
	/* [in] */ DISPID id,
1252
	/* [in] */ DISPID /*id*/,
1253
	/* [in] */ LCID lcid,
1253
	/* [in] */ LCID /*lcid*/,
1254
	/* [in] */ WORD wFlags,
1254
	/* [in] */ WORD /*wFlags*/,
1255
	/* [in] */ DISPPARAMS __RPC_FAR *pdp,
1255
	/* [in] */ DISPPARAMS __RPC_FAR* /*pdp*/,
1256
	/* [out] */ VARIANT __RPC_FAR *pvarRes,
1256
	/* [out] */ VARIANT __RPC_FAR* /*pvarRes*/,
1257
	/* [out] */ EXCEPINFO __RPC_FAR *pei,
1257
	/* [out] */ EXCEPINFO __RPC_FAR* /*pei*/,
1258
	/* [unique][in] */ IServiceProvider __RPC_FAR *pspCaller)
1258
	/* [unique][in] */ IServiceProvider __RPC_FAR* /*pspCaller*/)
1259
{
1259
{
1260
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1260
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1261
1261
Lines 1264-1278 Link Here
1264
1264
1265
1265
1266
STDMETHODIMP InterfaceOleWrapper_Impl::DeleteMemberByName( 
1266
STDMETHODIMP InterfaceOleWrapper_Impl::DeleteMemberByName( 
1267
    /* [in] */ BSTR bstr,
1267
    /* [in] */ BSTR /*bstr*/,
1268
    /* [in] */ DWORD grfdex)
1268
    /* [in] */ DWORD /*grfdex*/)
1269
{
1269
{
1270
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1270
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1271
1271
1272
	return ret;
1272
	return ret;
1273
}
1273
}
1274
1274
1275
STDMETHODIMP InterfaceOleWrapper_Impl::DeleteMemberByDispID(DISPID id)
1275
STDMETHODIMP InterfaceOleWrapper_Impl::DeleteMemberByDispID(DISPID /*id*/)
1276
{
1276
{
1277
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1277
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1278
1278
Lines 1280-1288 Link Here
1280
}
1280
}
1281
1281
1282
STDMETHODIMP InterfaceOleWrapper_Impl::GetMemberProperties( 
1282
STDMETHODIMP InterfaceOleWrapper_Impl::GetMemberProperties( 
1283
    /* [in] */ DISPID id,
1283
    /* [in] */ DISPID /*id*/,
1284
    /* [in] */ DWORD grfdexFetch,
1284
    /* [in] */ DWORD /*grfdexFetch*/,
1285
    /* [out] */ DWORD __RPC_FAR *pgrfdex)
1285
    /* [out] */ DWORD __RPC_FAR* /*pgrfdex*/)
1286
{
1286
{
1287
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1287
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1288
1288
Lines 1290-1297 Link Here
1290
}
1290
}
1291
1291
1292
STDMETHODIMP InterfaceOleWrapper_Impl::GetMemberName( 
1292
STDMETHODIMP InterfaceOleWrapper_Impl::GetMemberName( 
1293
    /* [in] */ DISPID id,
1293
    /* [in] */ DISPID /*id*/,
1294
    /* [out] */ BSTR __RPC_FAR *pbstrName)
1294
    /* [out] */ BSTR __RPC_FAR* /*pbstrName*/)
1295
{
1295
{
1296
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1296
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1297
1297
Lines 1299-1307 Link Here
1299
}
1299
}
1300
1300
1301
STDMETHODIMP InterfaceOleWrapper_Impl::GetNextDispID( 
1301
STDMETHODIMP InterfaceOleWrapper_Impl::GetNextDispID( 
1302
    /* [in] */ DWORD grfdex,
1302
    /* [in] */ DWORD /*grfdex*/,
1303
    /* [in] */ DISPID id,
1303
    /* [in] */ DISPID /*id*/,
1304
    /* [out] */ DISPID __RPC_FAR *pid)
1304
    /* [out] */ DISPID __RPC_FAR* /*pid*/)
1305
{
1305
{
1306
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1306
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1307
1307
Lines 1309-1315 Link Here
1309
}
1309
}
1310
1310
1311
STDMETHODIMP InterfaceOleWrapper_Impl::GetNameSpaceParent( 
1311
STDMETHODIMP InterfaceOleWrapper_Impl::GetNameSpaceParent( 
1312
    /* [out] */ IUnknown __RPC_FAR *__RPC_FAR *ppunk)
1312
    /* [out] */ IUnknown __RPC_FAR *__RPC_FAR* /*ppunk*/)
1313
{
1313
{
1314
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1314
	HRESULT ret = ResultFromScode(E_NOTIMPL);	
1315
1315
Lines 1341-1348 Link Here
1341
	return Reference<XInterface>( xWeak, UNO_QUERY);
1341
	return Reference<XInterface>( xWeak, UNO_QUERY);
1342
}
1342
}
1343
1343
1344
STDMETHODIMP  UnoObjectWrapperRemoteOpt::GetIDsOfNames ( REFIID riid, OLECHAR ** rgszNames, unsigned int cNames,
1344
STDMETHODIMP  UnoObjectWrapperRemoteOpt::GetIDsOfNames ( REFIID /*riid*/, OLECHAR ** rgszNames, unsigned int cNames,
1345
								LCID lcid, DISPID * rgdispid )
1345
								LCID /*lcid*/, DISPID * rgdispid )
1346
{
1346
{
1347
	MutexGuard guard( getBridgeMutex());
1347
	MutexGuard guard( getBridgeMutex());
1348
1348
Lines 1389-1395 Link Here
1389
	return ret;
1389
	return ret;
1390
}
1390
}
1391
1391
1392
STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID riid, LCID lcid, unsigned short wFlags,
1392
STDMETHODIMP  UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*riid*/, LCID /*lcid*/, unsigned short wFlags,
1393
	                     DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
1393
	                     DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
1394
	                     unsigned int * puArgErr )
1394
	                     unsigned int * puArgErr )
1395
{
1395
{
Lines 1640-1647 Link Here
1640
    return ret;
1640
    return ret;
1641
}
1641
}
1642
1642
1643
HRESULT	UnoObjectWrapperRemoteOpt::methodInvoke( DISPID dispidMember, DISPPARAMS * pdispparams, VARIANT * pvarResult, 
1643
HRESULT	UnoObjectWrapperRemoteOpt::methodInvoke( DISPID /*dispidMember*/, DISPPARAMS * /*pdispparams*/, VARIANT * /*pvarResult*/, 
1644
							  EXCEPINFO * pexcepinfo, unsigned int * puArgErr, Sequence<Any> params)
1644
							  EXCEPINFO * /*pexcepinfo*/, unsigned int * /*puArgErr*/, Sequence<Any> params)
1645
{
1645
{
1646
	return S_OK;
1646
	return S_OK;
1647
}
1647
}
(-)unoobjw.hxx (-1 / +1 lines)
Lines 49-55 Link Here
49
#include "ole2uno.hxx"
49
#include "ole2uno.hxx"
50
#include "unoconversionutilities.hxx"
50
#include "unoconversionutilities.hxx"
51
51
52
#define INVOCATION_SERVICE	L"com.sun.star.script.Invocation"
52
//#define INVOCATION_SERVICE	L"com.sun.star.script.Invocation"
53
#define JSCRIPT_VALUE_FUNC	L"_GetValueObject"
53
#define JSCRIPT_VALUE_FUNC	L"_GetValueObject"
54
#define GET_STRUCT_FUNC		L"_GetStruct"
54
#define GET_STRUCT_FUNC		L"_GetStruct"
55
#define BRIDGE_VALUE_FUNC L"Bridge_GetValueObject"
55
#define BRIDGE_VALUE_FUNC L"Bridge_GetValueObject"
(-)unotypewrapper.cxx (-11 / +11 lines)
Lines 86-109 Link Here
86
86
87
87
88
// UnoTypeWrapper, IDispatch --------------------------------------------
88
// UnoTypeWrapper, IDispatch --------------------------------------------
89
STDMETHODIMP UnoTypeWrapper::GetTypeInfoCount(UINT *pctinfo)
89
STDMETHODIMP UnoTypeWrapper::GetTypeInfoCount(UINT* /*pctinfo*/)
90
{
90
{
91
	return E_NOTIMPL;
91
	return E_NOTIMPL;
92
}
92
}
93
93
94
// UnoTypeWrapper, IDispatch --------------------------------------------
94
// UnoTypeWrapper, IDispatch --------------------------------------------
95
STDMETHODIMP UnoTypeWrapper::GetTypeInfo( UINT iTInfo,
95
STDMETHODIMP UnoTypeWrapper::GetTypeInfo( UINT /*iTInfo*/,
96
                                          LCID lcid,
96
                                          LCID /*lcid*/,
97
                                          ITypeInfo **ppTInfo)
97
                                          ITypeInfo** /*ppTInfo*/)
98
{
98
{
99
	return E_NOTIMPL;
99
	return E_NOTIMPL;
100
}
100
}
101
101
102
// UnoTypeWrapper, IDispatch --------------------------------------------
102
// UnoTypeWrapper, IDispatch --------------------------------------------
103
STDMETHODIMP UnoTypeWrapper::GetIDsOfNames( REFIID riid,
103
STDMETHODIMP UnoTypeWrapper::GetIDsOfNames( REFIID /*riid*/,
104
                                            LPOLESTR *rgszNames,
104
                                            LPOLESTR *rgszNames,
105
                                            UINT cNames,			
105
                                            UINT /*cNames*/,			
106
                                            LCID lcid,
106
                                            LCID /*lcid*/,
107
                                            DISPID *rgDispId)
107
                                            DISPID *rgDispId)
108
{
108
{
109
	if( !rgDispId)
109
	if( !rgDispId)
Lines 123-135 Link Here
123
123
124
// UnoTypeWrapper, IDispatch --------------------------------------------
124
// UnoTypeWrapper, IDispatch --------------------------------------------
125
STDMETHODIMP UnoTypeWrapper::Invoke( DISPID dispIdMember,
125
STDMETHODIMP UnoTypeWrapper::Invoke( DISPID dispIdMember,
126
						 REFIID riid,
126
						 REFIID /*riid*/,
127
						 LCID lcid,
127
						 LCID /*lcid*/,
128
						 WORD wFlags,
128
						 WORD wFlags,
129
						 DISPPARAMS *pDispParams,
129
						 DISPPARAMS *pDispParams,
130
						 VARIANT *pVarResult,
130
						 VARIANT *pVarResult,
131
						 EXCEPINFO *pExcepInfo,
131
						 EXCEPINFO* /*pExcepInfo*/,
132
						 UINT *puArgErr)
132
						 UINT* /*puArgErr*/)
133
{
133
{
134
    if (pDispParams == NULL)
134
    if (pDispParams == NULL)
135
        return DISP_E_EXCEPTION;
135
        return DISP_E_EXCEPTION;
(-)windata.hxx (+4 lines)
Lines 35-42 Link Here
35
#ifndef AUTOMATION_BRIDGE_WINDATA_HXX
35
#ifndef AUTOMATION_BRIDGE_WINDATA_HXX
36
#define AUTOMATION_BRIDGE_WINDATA_HXX
36
#define AUTOMATION_BRIDGE_WINDATA_HXX
37
37
38
#pragma warning (push,1)
39
#pragma warning (disable:4668)
38
#include "oleidl.h"
40
#include "oleidl.h"
41
39
#include <atlbase.h>
42
#include <atlbase.h>
43
#pragma warning (pop)
40
#include "osl/diagnose.h"
44
#include "osl/diagnose.h"
41
45
42
namespace ole_adapter
46
namespace ole_adapter

Return to issue 81612