Skip to content

C
core
Kaydet (Commit) 3481ba93 authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann
Dosyalara gözat
Seçenekler

CWS-TOOLING: integrate CWS jl129 

2009-07-08 09:24:14 +0200 jl  r273817 : #i103275# catching DisposedException when calling XDesktop.terminate, the test librariesversion_3_0_0.dll, ..3_0_1.dll, .. 3.1.dll have been recreated and checked in
2009-07-08 09:20:29 +0200 jl  r273816 : #
2009-07-07 10:51:52 +0200 jl  r273784 : #103378# allow to pass Nothing in Basic for uno null reference
2009-07-07 10:30:48 +0200 jl  r273781 : #103242# VS 2008 changes
2009-07-07 10:21:23 +0200 jl  r273778 : #103242
2009-07-07 10:12:20 +0200 jl  r273777 : #103242 adapting to VS 2008
2009-07-03 09:47:21 +0200 jl  r273679 : #i10324# fix build errors
2009-07-03 09:12:08 +0200 jl  r273677 : #i10324# fix build errors
2009-07-02 15:26:07 +0200 jl  r273657 : #i103242 make it build again
2009-07-02 14:39:34 +0200 jl  r273652 : #i103242 make it build again
2009-07-02 14:18:45 +0200 jl  r273650 : #i103242 remove warnings
2009-07-02 14:11:48 +0200 jl  r273648 : #i103242
2009-07-02 12:41:23 +0200 jl  r273637 : #i103242
2009-07-02 12:25:09 +0200 jl  r273636 : #i103242 upgraded to VS2008
2009-07-02 12:00:07 +0200 jl  r273632 : #i103242 upgraded to VS2008
2009-07-02 11:30:55 +0200 jl  r273630 : #i103242 test does not build anymore
2009-07-02 11:14:21 +0200 jl  r273629 : #i103242 test does not build anymore
2009-07-02 10:59:56 +0200 jl  r273628 : #i103242 test does not build anymore
2009-07-02 10:17:43 +0200 jl  r273622 : #i103242 run test prints out the InnerException in case there was an exception. The InnerException is usually the one thrown in OOo
2009-07-01 17:06:24 +0200 jl  r273604 : #i103242 test does not build anymore
üst a7b1047c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 308 additions and 187 deletions
extensions/source/ole/unoconversionutilities.hxx
Dosyayı görüntüle @ 3481ba93
...@@ -1684,7 +1684,8 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& ...@@ -1684,7 +1684,8 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& aType= Type()) Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& aType= Type())
#endif #endif
{ {
if (pVar->vt != VT_UNKNOWN && pVar->vt != VT_DISPATCH) //To allow passing "Nothing" in VS 2008 we need to accept VT_EMPTY
if (pVar->vt != VT_UNKNOWN && pVar->vt != VT_DISPATCH && pVar->vt != VT_EMPTY)
throw IllegalArgumentException( throw IllegalArgumentException(
OUSTR("[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" OUSTR("[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n"
"The VARIANT does not contain an object type! "), 0, -1); "The VARIANT does not contain an object type! "), 0, -1);
...@@ -1719,13 +1720,23 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& ...@@ -1719,13 +1720,23 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
Any ret; Any ret;
//If no Type is provided and pVar contains IUnknown then we return a XInterface. //If no Type is provided and pVar contains IUnknown then we return a XInterface.
//If pVar contains an IDispatch then we return a XInvocation. //If pVar contains an IDispatch then we return a XInvocation.
Type desiredType; Type desiredType = aType;
if (aType == VOID_TYPE && pVar->vt == VT_UNKNOWN)
if (aType == VOID_TYPE)
{
switch (pVar->vt)
{
case VT_EMPTY:
case VT_UNKNOWN:
desiredType = getCppuType((Reference<XInterface>*) 0); desiredType = getCppuType((Reference<XInterface>*) 0);
else if (aType == VOID_TYPE && pVar->vt == VT_DISPATCH) break;
case VT_DISPATCH:
desiredType = getCppuType((Reference<XInvocation>*) 0); desiredType = getCppuType((Reference<XInvocation>*) 0);
else break;
default:
desiredType = aType; desiredType = aType;
}
}
// COM pointer are NULL, no wrapper required // COM pointer are NULL, no wrapper required
if (spUnknown == NULL) if (spUnknown == NULL)
......
extensions/test/ole/AxTestComponents/AxTestComponents.def
Dosyayı görüntüle @ 3481ba93
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
LIBRARY "AxTestComponents.DLL" LIBRARY "AxTestComponents.DLL"
EXPORTS EXPORTS
DllCanUnloadNow @1 PRIVATE DllCanUnloadNow PRIVATE
DllGetClassObject @2 PRIVATE DllGetClassObject PRIVATE
DllRegisterServer @3 PRIVATE DllRegisterServer PRIVATE
DllUnregisterServer @4 PRIVATE DllUnregisterServer PRIVATE
extensions/test/ole/AxTestComponents/AxTestComponents.sln
Dosyayı görüntüle @ 3481ba93
Microsoft Visual Studio Solution File, Format Version 8.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AxTestComponents", "AxTestComponents.vcproj", "{CF6DC513-B04E-420A-A0F9-6D1F4046D098}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AxTestComponents", "AxTestComponents.vcproj", "{CF6DC513-B04E-420A-A0F9-6D1F4046D098}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfiguration) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug = Debug Debug|Win32 = Debug|Win32
Release MinDependency = Release MinDependency Release MinDependency|Win32 = Release MinDependency|Win32
Release MinSize = Release MinSize Release MinSize|Win32 = Release MinSize|Win32
Unicode Debug = Unicode Debug Unicode Debug|Win32 = Unicode Debug|Win32
Unicode Release MinDependency = Unicode Release MinDependency Unicode Release MinDependency|Win32 = Unicode Release MinDependency|Win32
Unicode Release MinSize = Unicode Release MinSize Unicode Release MinSize|Win32 = Unicode Release MinSize|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Debug.ActiveCfg = Debug|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Debug|Win32.ActiveCfg = Debug|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Debug.Build.0 = Debug|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Debug|Win32.Build.0 = Debug|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Release MinDependency.ActiveCfg = Release MinDependency|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Release MinDependency|Win32.ActiveCfg = Release MinDependency|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Release MinDependency.Build.0 = Release MinDependency|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Release MinDependency|Win32.Build.0 = Release MinDependency|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Release MinSize.ActiveCfg = Release MinSize|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Release MinSize|Win32.ActiveCfg = Release MinSize|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Release MinSize.Build.0 = Release MinSize|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Release MinSize|Win32.Build.0 = Release MinSize|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Debug.ActiveCfg = Unicode Debug|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Debug.Build.0 = Unicode Debug|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Release MinDependency.ActiveCfg = Unicode Release MinDependency|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Release MinDependency|Win32.ActiveCfg = Unicode Release MinDependency|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Release MinDependency.Build.0 = Unicode Release MinDependency|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Release MinDependency|Win32.Build.0 = Unicode Release MinDependency|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Release MinSize.ActiveCfg = Unicode Release MinSize|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Release MinSize|Win32.ActiveCfg = Unicode Release MinSize|Win32
{CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Release MinSize.Build.0 = Unicode Release MinSize|Win32 {CF6DC513-B04E-420A-A0F9-6D1F4046D098}.Unicode Release MinSize|Win32.Build.0 = Unicode Release MinSize|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(SolutionProperties) = preSolution
EndGlobalSection HideSolutionNode = FALSE
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal
extensions/test/ole/DCOM/Clients/WriterDemo/readme.txt
Dosyayı görüntüle @ 3481ba93
Visual Basic client that instantiates a Windows Script Component Visual Basic client that instantiates a Windows Script Component
,dcomtest.writerdemo.wsc. That component is located in ,dcomtest.writerdemo.wsc. That component is located in
extensions/test/ole/DCOM/scriptComponents/WriterDemo.wsc. extensions/test/ole/DCOM/scriptComponents/WriterDemo.wsc. Don't forget to
Don't forget to register that component (right-click,select register). register that component (right-click,select register).
\ No newline at end of file
extensions/test/ole/EventListenerSample/EventListener/EventListener.def
Dosyayı görüntüle @ 3481ba93
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
LIBRARY "EventListener.DLL" LIBRARY "EventListener.DLL"
EXPORTS EXPORTS
DllCanUnloadNow @1 PRIVATE DllCanUnloadNow PRIVATE
DllGetClassObject @2 PRIVATE DllGetClassObject PRIVATE
DllRegisterServer @3 PRIVATE DllRegisterServer PRIVATE
DllUnregisterServer @4 PRIVATE DllUnregisterServer PRIVATE
extensions/test/ole/EventListenerSample/EventListener/EventListener.dsw deleted 100644 → 0
Dosyayı görüntüle @ a7b1047c
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "EventListener"=.\EventListener.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################
extensions/test/ole/EventListenerSample/EventListener/EventListener.sln 0 → 100644
Dosyayı görüntüle @ 3481ba93

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EventListener", "EventListener.vcproj", "{055137B6-A402-4913-AC11-9A096E866F5B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release MinDependency|Win32 = Release MinDependency|Win32
Release MinSize|Win32 = Release MinSize|Win32
Unicode Debug|Win32 = Unicode Debug|Win32
Unicode Release MinDependency|Win32 = Unicode Release MinDependency|Win32
Unicode Release MinSize|Win32 = Unicode Release MinSize|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{055137B6-A402-4913-AC11-9A096E866F5B}.Debug|Win32.ActiveCfg = Debug|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Debug|Win32.Build.0 = Debug|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Release MinDependency|Win32.ActiveCfg = Release MinDependency|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Release MinDependency|Win32.Build.0 = Release MinDependency|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Release MinSize|Win32.ActiveCfg = Release MinSize|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Release MinSize|Win32.Build.0 = Release MinSize|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Unicode Release MinDependency|Win32.ActiveCfg = Unicode Release MinDependency|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Unicode Release MinDependency|Win32.Build.0 = Unicode Release MinDependency|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Unicode Release MinSize|Win32.ActiveCfg = Unicode Release MinSize|Win32
{055137B6-A402-4913-AC11-9A096E866F5B}.Unicode Release MinSize|Win32.Build.0 = Unicode Release MinSize|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
extensions/test/ole/EventListenerSample/readme.txt
Dosyayı görüntüle @ 3481ba93
EventListener EventListener
________________________________________________________ ========================================
The folder EventListener contains an MSDEV project that builds a dll that
contains the EventListener.EvtListener ActiveX component. The component
implements the XEventListener interface according to the rules of the
OleBridge. The component will be used from the HTML page events.htm.
The folder EventListener contains an MSDEV project that builds a dll that contains
the EventListener.EvtListener ActiveX component. The component implements the XEventListener
interface according to the rules of the OleBridge. The component will be used from the
HTML page events.htm.
VBEventListener: VBEventListener:
_________________________________________________________ ========================================
Contains a Visual Basic project that builds an ActiveX component that implements Contains a Visual Basic project that builds an ActiveX component that implements
com.sun.star.lang.XEventListener. Its ProgId is VBasicEventListener.VBEventListener com.sun.star.lang.XEventListener. Its ProgId is
The dll should also be checked in. VB needs its TLB, so it uses the same CLSIDs on VBasicEventListener.VBEventListener The dll should also be checked in. VB needs
the next build. The component will create a message box when its disposing function its TLB, so it uses the same CLSIDs on the next build. The component will create
has been called. a message box when its disposing function has been called.
The project also contains a client that builds a Project1.exe (in the same folder) The project also contains a client that builds a Project1.exe (in the same
that creates VBEventListener and adds it to a StarOffice document folder) that creates VBEventListener and adds it to a StarOffice document
extensions/test/ole/MfcControl/MfcControl.def
Dosyayı görüntüle @ 3481ba93
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
LIBRARY "MFCCONTROL.OCX" LIBRARY "MFCCONTROL.OCX"
EXPORTS EXPORTS
DllCanUnloadNow @1 PRIVATE DllCanUnloadNow PRIVATE
DllGetClassObject @2 PRIVATE DllGetClassObject PRIVATE
DllRegisterServer @3 PRIVATE DllRegisterServer PRIVATE
DllUnregisterServer @4 PRIVATE DllUnregisterServer PRIVATE
extensions/test/ole/MfcControl/MfcControl.rc
Dosyayı görüntüle @ 3481ba93
...@@ -84,7 +84,7 @@ END ...@@ -84,7 +84,7 @@ END
// Bitmap // Bitmap
// //
IDB_MFCCONTROL BITMAP DISCARDABLE "MfcControlCtl.bmp" //IDB_MFCCONTROL BITMAP DISCARDABLE "MfcControlCtl.bmp"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
......
extensions/test/ole/MfcControl/MfcControl.sln
Dosyayı görüntüle @ 3481ba93
Microsoft Visual Studio Solution File, Format Version 7.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MfcControl", "MfcControl.vcproj", "{07D59661-3519-4F10-AE9F-22DB0479E25A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MfcControl", "MfcControl.vcproj", "{07D59661-3519-4F10-AE9F-22DB0479E25A}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfiguration) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
ConfigName.0 = Debug Debug|Win32 = Debug|Win32
ConfigName.1 = Release Release|Win32 = Release|Win32
ConfigName.2 = Unicode Debug Unicode Debug|Win32 = Unicode Debug|Win32
ConfigName.3 = Unicode Release Unicode Release|Win32 = Unicode Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Debug|Win32.ActiveCfg = Debug|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Debug|Win32.Build.0 = Debug|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Release|Win32.ActiveCfg = Release|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Release|Win32.Build.0 = Release|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution GlobalSection(SolutionProperties) = preSolution
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Debug.ActiveCfg = Debug|Win32 HideSolutionNode = FALSE
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Debug.Build.0 = Debug|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Release.ActiveCfg = Release|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Release.Build.0 = Release|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Unicode Debug.ActiveCfg = Unicode Debug|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Unicode Debug.Build.0 = Unicode Debug|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Unicode Release.ActiveCfg = Unicode Release|Win32
{07D59661-3519-4F10-AE9F-22DB0479E25A}.Unicode Release.Build.0 = Unicode Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal
extensions/test/ole/OleClient/axhost.cxx
Dosyayı görüntüle @ 3481ba93
...@@ -46,7 +46,7 @@ HostWin::~HostWin() ...@@ -46,7 +46,7 @@ HostWin::~HostWin()
} }
LRESULT HostWin::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT HostWin::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
{ {
CAxWindow wnd(m_hWnd); CAxWindow wnd(m_hWnd);
......
extensions/test/ole/OleClient/clientTest.cxx
Dosyayı görüntüle @ 3481ba93
...@@ -86,7 +86,7 @@ void printResultVariantArray( VARIANT & var); ...@@ -86,7 +86,7 @@ void printResultVariantArray( VARIANT & var);
void printVariant( VARIANT & var); void printVariant( VARIANT & var);
void printSequence( Sequence<Any>& val); void printSequence( Sequence<Any>& val);
extern "C" int __cdecl main( int argc, char * argv[] ) extern "C" int __cdecl main( int , char **)
{ {
HRESULT hr; HRESULT hr;
if( FAILED( hr=CoInitialize(NULL))) if( FAILED( hr=CoInitialize(NULL)))
...@@ -381,7 +381,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv) ...@@ -381,7 +381,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv)
Any inrefVariant, outrefVariant; Any inrefVariant, outrefVariant;
Any inrefDecimal, outrefDecimal; Any inrefDecimal, outrefDecimal;
Any inParamsLong, outParamsLong; Any inParamsLong, outParamsLong;
Reference<XInterface> xintUnknown = getComObject(L"AxTestComponents.Foo"); Reference<XInterface> xintUnknown(getComObject(L"AxTestComponents.Foo"));
inBool <<= (sal_Bool) sal_True; inBool <<= (sal_Bool) sal_True;
inv->setValue(OUString(L"prpBool"), inBool); inv->setValue(OUString(L"prpBool"), inBool);
...@@ -391,7 +391,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv) ...@@ -391,7 +391,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv)
inv->setValue(OUString(L"prpByte"), inByte); inv->setValue(OUString(L"prpByte"), inByte);
outByte = inv->getValue(OUString(L"prpByte")); outByte = inv->getValue(OUString(L"prpByte"));
inShort <<= ( sal_Int16) 0xffff; inShort <<= static_cast<sal_Int16>( -1);
inv->setValue(OUString(L"prpShort"), inShort); inv->setValue(OUString(L"prpShort"), inShort);
outShort = inv->getValue(OUString(L"prpShort")); outShort = inv->getValue(OUString(L"prpShort"));
...@@ -659,7 +659,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv) ...@@ -659,7 +659,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
Any inrefVariant, outrefVariant; Any inrefVariant, outrefVariant;
Any inrefDecimal, outrefDecimal; Any inrefDecimal, outrefDecimal;
Reference<XInterface> xIntFoo = getComObject(L"AxTestComponents.Foo"); Reference<XInterface> xIntFoo(getComObject(L"AxTestComponents.Foo"));
//################################################################################### //###################################################################################
// in and out parameter // in and out parameter
//################################################################################### //###################################################################################
...@@ -678,7 +678,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv) ...@@ -678,7 +678,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
inv->invoke(OUString(L"outByte"), Sequence< Any > ( & outByte, 1), seqIndices, seqOut); inv->invoke(OUString(L"outByte"), Sequence< Any > ( & outByte, 1), seqIndices, seqOut);
outByte <<= seqOut[0]; outByte <<= seqOut[0];
inShort <<= ( sal_Int16) 0xffff; inShort <<= static_cast<sal_Int16>(-1);
inv->invoke(OUString(L"inShort"), Sequence< Any > ( & inShort, 1), seqIndices, seqOut); inv->invoke(OUString(L"inShort"), Sequence< Any > ( & inShort, 1), seqIndices, seqOut);
seqIndices.realloc( 0); seqIndices.realloc( 0);
seqOut.realloc(0); seqOut.realloc(0);
...@@ -1221,7 +1221,7 @@ HRESULT doTest() ...@@ -1221,7 +1221,7 @@ HRESULT doTest()
// invMfc->invoke( OUString(L"inByte"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); // invMfc->invoke( OUString(L"inByte"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
if ( ! invMfc.is()) if ( ! invMfc.is())
return hr; return hr;
aAny <<= ( sal_Int16) 0xffff; aAny <<= static_cast<sal_Int16>(-1);
aAny= invMfc->invoke( OUString(L"inShort"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); aAny= invMfc->invoke( OUString(L"inShort"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
// //
......
extensions/test/ole/OleClient/funcs.cxx
Dosyayı görüntüle @ 3481ba93
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "com/sun/star/uno/TypeClass.hpp" #include "com/sun/star/uno/TypeClass.hpp"
#include "com/sun/star/script/XInvocation.hpp" #include "com/sun/star/script/XInvocation.hpp"
#include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/uno/XComponentContext.hpp"
#include <com/sun/star/bridge/oleautomation/NamedArgument.hpp> #include <com/sun/star/bridge/oleautomation/NamedArgument.hpp>
#include "rtl/ustring.hxx" #include "rtl/ustring.hxx"
...@@ -276,6 +277,7 @@ bool equalSequences(const Any& orig, const Any& returned) ...@@ -276,6 +277,7 @@ bool equalSequences(const Any& orig, const Any& returned)
default: default:
return false; return false;
} }
return false;
} }
template< class T > template< class T >
...@@ -292,6 +294,7 @@ bool equalSequences(const Sequence<T>& seqIn, const Sequence<Any> & seqOut) ...@@ -292,6 +294,7 @@ bool equalSequences(const Sequence<T>& seqIn, const Sequence<Any> & seqOut)
if (anyIn != anyOut) if (anyIn != anyOut)
return false; return false;
} }
return true; return true;
} }
......
extensions/test/ole/OleClient/readme.txt
Dosyayı görüntüle @ 3481ba93
...@@ -8,9 +8,3 @@ COM component: XCallback_Impl.Simple ( extensions/test/ole/unotocomcalls/XCallba ...@@ -8,9 +8,3 @@ COM component: XCallback_Impl.Simple ( extensions/test/ole/unotocomcalls/XCallba
ActiveX controls: AxTestComponent.Basic ( extensions/test/ole/AxTestComponents) ActiveX controls: AxTestComponent.Basic ( extensions/test/ole/AxTestComponents)
MFCCONTROL.MfcControlCtrl.1 (extensions/test/ole/MfcControl) MFCCONTROL.MfcControlCtrl.1 (extensions/test/ole/MfcControl)
//The project cannot be build in our environment therefore it must be an MSDEV project.
//Reason: ATL uses min and max macros defined in windef.h. Our stl header undef min and max.
//To generate the uno header use the make file. Then Set the include path directories to
//the inc directory in the build tree.
Now with Visual Studio .NET 2002 it seems to work
extensions/test/ole/OleConverterVar1/convTest.cxx
Dosyayı görüntüle @ 3481ba93
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove // MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx" #include "precompiled_extensions.hxx"
#pragma warning (disable: 4917)
#include <windows.h> #include <windows.h>
#include <comdef.h> #include <comdef.h>
#include <tchar.h> #include <tchar.h>
......
extensions/test/ole/OleConverterVar1/readme.txt
Dosyayı görüntüle @ 3481ba93
Currently broken!!
The program test the Service com.sun.star.bridge.OleBridgeSupplierVar1. The program test the Service com.sun.star.bridge.OleBridgeSupplierVar1.
While running in debug mode it writes infos to the debug - output. While running in debug mode it writes infos to the debug - output.
The executable needs a applicat.rdb present with the registered services The executable needs a services.rdb present with the registered services
com.sun.star.bridge.OleBridgeSupplierVar1, oletest.OleTest. The OleTest com.sun.star.bridge.OleBridgeSupplierVar1, oletest.OleTest. The OleTest
component resides in extensions/test/ole/cpnt. The build creates an component resides in extensions/test/ole/cpnt. The build creates an
oletest.rdb file that must be merged with the applicat.rdb and OleTest oletest.rdb file that must be merged with the types.rdb and OleTest
must be registered to the applicat.rdb. must be registered to the services.rdb.
\ No newline at end of file
extensions/test/ole/StarBasic_OleClient/oleclient.bas
Dosyayı görüntüle @ 3481ba93
...@@ -350,10 +350,11 @@ inLong = 0 ...@@ -350,10 +350,11 @@ inLong = 0
inFloat = 0 inFloat = 0
inVariant = 0 inVariant = 0
inVariant2 = 0 inVariant2 = 0
'defaults are: 1, 2. , 3, 4 'defaults are: 1, 2, 4
'The third parameter is a VARIANT with a default value of 4. COM gives it the type BSTR
obj.defaultvalue1() obj.defaultvalue1()
obj.defaultvalue2(inLong, inFloat, inVariant) obj.defaultvalue2(inLong, inFloat, inVariant)
If inLong <> 1 Or inFloat <> 2 Or inVariant <> 3 Then If inLong <> 1 Or inFloat <> 2 Or inVariant <> "4" Then
runtest = -1 runtest = -1
Exit Function Exit Function
End If End If
...@@ -365,7 +366,7 @@ inVariant = 0 ...@@ -365,7 +366,7 @@ inVariant = 0
inVariant = 0 inVariant = 0
obj.defaultvalue1(inLong, inFloat) obj.defaultvalue1(inLong, inFloat)
obj.defaultvalue2(inLong, inFloat, inVariant) obj.defaultvalue2(inLong, inFloat, inVariant)
If inLong <> inLong2 Or inFloat <> inFloat2 Or inVariant <> 3 Then If inLong <> inLong2 Or inFloat <> inFloat2 Or inVariant <> "4" Then
runtest = -1 runtest = -1
Exit Function Exit Function
End If End If
......
extensions/test/ole/VisualBasic/AssemblyInfo.vb 0 → 100644
Dosyayı görüntüle @ 3481ba93
Imports System.Reflection
Imports System.Runtime.CompilerServices
Imports System.Runtime.InteropServices
' General Information about an assembly is controlled through the following
' set of attributes. Change these attribute values to modify the information
' associated with an assembly.
' TODO: Review the values of the assembly attributes
<Assembly: AssemblyTitle("")>
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("StarOffice")>
<Assembly: AssemblyProduct("")>
<Assembly: AssemblyCopyright("")>
<Assembly: AssemblyTrademark("")>
<Assembly: AssemblyCulture("")>
' Version information for an assembly consists of the following four values:
' Major version
' Minor Version
' Build Number
' Revision
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:
<Assembly: AssemblyVersion("1.0.*")>
extensions/test/ole/VisualBasic/Form1.frm deleted 100644 → 0
Dosyayı görüntüle @ a7b1047c
This diff is collapsed.
extensions/test/ole/VisualBasic/Module1.vb 0 → 100644
Dosyayı görüntüle @ 3481ba93
This diff is collapsed.
extensions/test/ole/VisualBasic/Project1.sln 0 → 100644
Dosyayı görüntüle @ 3481ba93

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Project1", "Project1.vbproj", "{F62D440E-8976-4A6D-91A8-89F09701074F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F62D440E-8976-4A6D-91A8-89F09701074F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F62D440E-8976-4A6D-91A8-89F09701074F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F62D440E-8976-4A6D-91A8-89F09701074F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F62D440E-8976-4A6D-91A8-89F09701074F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
extensions/test/ole/VisualBasic/Project1.vbp deleted 100644 → 0
Dosyayı görüntüle @ a7b1047c
Type=Exe
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINXP\System32\Stdole2.tlb#OLE Automation
Module=Module1; Module1.bas
Startup="Sub Main"
HelpFile=""
ExeName32="Project1.exe"
Command32=""
Name="Project1"
HelpContextID="0"
CompatibleMode="0"
MajorVer=1
MinorVer=0
RevisionVer=0
AutoIncrementVer=0
ServerSupportFiles=0
VersionCompanyName="StarOffice"
CompilationType=0
OptimizationType=0
FavorPentiumPro(tm)=0
CodeViewDebugInfo=0
NoAliasing=0
BoundsCheck=0
OverflowCheck=0
FlPointCheck=0
FDIVCheck=0
UnroundedFP=0
StartMode=0
Unattended=0
Retained=0
ThreadPerObject=0
MaxNumberOfThreads=1
[MS Transaction Server]
AutoRefresh=1
extensions/test/ole/VisualBasic/Project1.vbproj 0 → 100644
Dosyayı görüntüle @ 3481ba93
<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<MyType>WindowsFormsWithCustomSubMain</MyType>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F62D440E-8976-4A6D-91A8-89F09701074F}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<AssemblyName>Project1</AssemblyName>
<OutputType>WinExe</OutputType>
<StartupObject>Project1.Module1</StartupObject>
<AssemblyMajorVersion>1</AssemblyMajorVersion>
<AssemblyMinorVersion>0</AssemblyMinorVersion>
<AssemblyRevisionNumber>0</AssemblyRevisionNumber>
<GenerateRevisionNumber>False</GenerateRevisionNumber>
<AssemblyCompanyName>StarOffice</AssemblyCompanyName>
<RootNamespace>Project1</RootNamespace>
<FileUpgradeFlags>
</FileUpgradeFlags>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>.\bin\</OutputPath>
<DocumentationFile>Project1.xml</DocumentationFile>
<DebugSymbols>True</DebugSymbols>
<DefineDebug>True</DefineDebug>
<DefineTrace>True</DefineTrace>
<DefineConstants>Win32=True</DefineConstants>
<PlatformTarget>x86</PlatformTarget>
<NoWarn>42016,42017,42018,42019,42032</NoWarn>
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>.\bin\</OutputPath>
<DocumentationFile>Project1.xml</DocumentationFile>
<DebugSymbols>False</DebugSymbols>
<DefineDebug>False</DefineDebug>
<DefineTrace>True</DefineTrace>
<DefineConstants>Win32=True</DefineConstants>
<PlatformTarget>x86</PlatformTarget>
<NoWarn>42016,42017,42018,42019,42032</NoWarn>
<DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic.Compatibility">
<Name>Microsoft.VisualBasic.Compatibility</Name>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.Windows.Forms">
<Name>System.Windows.Forms</Name>
</Reference>
<Reference Include="System.XML">
<Name>System.XML</Name>
</Reference>
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
<Import Include="Microsoft.VisualBasic.Compatibility" />
<Import Include="System" />
<Import Include="System.Collections" />
<Import Include="System.Data" />
<Import Include="System.Diagnostics" />
<Import Include="System.Drawing" />
<Import Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.vb" />
<Compile Include="Module1.vb">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="My Project\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
extensions/test/ole/cpnt/cpnt.cxx
Dosyayı görüntüle @ 3481ba93
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include <cppuhelper/implbase7.hxx> #include <cppuhelper/implbase7.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.h>
#include <rtl/ustring> #include <rtl/ustring.h>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <oletest/XTestSequence.hpp> #include <oletest/XTestSequence.hpp>
#include <oletest/XTestStruct.hpp> #include <oletest/XTestStruct.hpp>
...@@ -374,7 +374,7 @@ Sequence<OUString> OComponent_getSupportedServiceNames(void) ...@@ -374,7 +374,7 @@ Sequence<OUString> OComponent_getSupportedServiceNames(void)
} }
extern "C" sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) extern "C" sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
{ {
if(pRegistryKey) if(pRegistryKey)
{ {
...@@ -395,7 +395,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void ...@@ -395,7 +395,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void
} }
extern "C" void * SAL_CALL component_getFactory( extern "C" void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
static void * pRet= NULL; static void * pRet= NULL;
if( ! pRet) if( ! pRet)
...@@ -421,7 +421,7 @@ extern "C" void * SAL_CALL component_getFactory( ...@@ -421,7 +421,7 @@ extern "C" void * SAL_CALL component_getFactory(
} }
extern "C" void SAL_CALL component_getImplementationEnvironment( extern "C" void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) const sal_Char ** ppEnvTypeName, uno_Environment ** )
{ {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }
...@@ -983,11 +983,11 @@ void SAL_CALL OComponent::testout_methodMulParams2(sal_Int32& rout1, sal_Int32& ...@@ -983,11 +983,11 @@ void SAL_CALL OComponent::testout_methodMulParams2(sal_Int32& rout1, sal_Int32&
rout2= 1222; rout2= 1222;
rout3= L" another string"; rout3= L" another string";
} }
void SAL_CALL OComponent::testout_methodMulParams3(const OUString& sin, OUString& sout) throw( RuntimeException ) void SAL_CALL OComponent::testout_methodMulParams3(const OUString&, OUString& sout) throw( RuntimeException )
{ {
sout= L"Out Hallo!"; sout= L"Out Hallo!";
} }
void SAL_CALL OComponent::testout_methodMulParams4( float in1, float& out1, sal_Int32 in2, sal_Int32& out2, sal_Int32 in3 ) throw(RuntimeException) void SAL_CALL OComponent::testout_methodMulParams4( float in1, float& out1, sal_Int32 in2, sal_Int32& out2, sal_Int32 ) throw(RuntimeException)
{ {
out1= in1 + 1; out1= in1 + 1;
out2= in2 + 1; out2= in2 + 1;
...@@ -1091,11 +1091,11 @@ Reference<XInvocation > SAL_CALL OComponent::in_methodInvocation( const Referenc ...@@ -1091,11 +1091,11 @@ Reference<XInvocation > SAL_CALL OComponent::in_methodInvocation( const Referenc
try{ try{
inv->invoke( OUString(RTL_CONSTASCII_USTRINGPARAM("disposing")), inv->invoke( OUString(RTL_CONSTASCII_USTRINGPARAM("disposing")),
params, outIndex, outParams); params, outIndex, outParams);
}catch(IllegalArgumentException & iae) { }catch(IllegalArgumentException &) {
} }
catch(CannotConvertException & cce) { catch(CannotConvertException &){
} }
catch(InvocationTargetException& ite) { catch(InvocationTargetException&) {
} }
return inv; return inv;
} }
...@@ -1113,9 +1113,10 @@ SimpleStruct SAL_CALL OComponent::in_methodStruct( const SimpleStruct& aStruct ) ...@@ -1113,9 +1113,10 @@ SimpleStruct SAL_CALL OComponent::in_methodStruct( const SimpleStruct& aStruct )
"This string was set in OleTest")); "This string was set in OleTest"));
return aStruct; return aStruct;
} }
void SAL_CALL OComponent::in_methodAll( sal_Int8 b, float f, double d, sal_Bool boo, sal_Int16 sh, sal_uInt16 us, void SAL_CALL OComponent::in_methodAll(
sal_Int32 l, sal_uInt32 ul, const OUString& s, sal_Unicode c, sal_Int8, float, double, sal_Bool, sal_Int16, sal_uInt16,
const Any& a, const Type& t, const Reference<XInvocation>& inv ) throw (RuntimeException) sal_Int32, sal_uInt32, const OUString&, sal_Unicode,
const Any&, const Type&, const Reference<XInvocation>&) throw (RuntimeException)
{ {
} }
...@@ -1324,7 +1325,7 @@ Property SAL_CALL OComponent::methodStruct2( const Property& aProp ) throw (Runt ...@@ -1324,7 +1325,7 @@ Property SAL_CALL OComponent::methodStruct2( const Property& aProp ) throw (Runt
} }
// XTestOther ================================================================================== // XTestOther ==================================================================================
void SAL_CALL OComponent::other_methodAnyIn(const Any& rAny) throw( RuntimeException ) void SAL_CALL OComponent::other_methodAnyIn(const Any& ) throw( RuntimeException )
{ {
} }
void SAL_CALL OComponent::other_methodAnyOut(Any& rAny) throw( RuntimeException ) void SAL_CALL OComponent::other_methodAnyOut(Any& rAny) throw( RuntimeException )
...@@ -1471,8 +1472,8 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac ...@@ -1471,8 +1472,8 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
sal_Int8 aByte; sal_Int8 aByte;
sal_Int16 aShort; sal_Int16 aShort;
sal_Int32 aLong; sal_Int32 aLong;
sal_uInt16 aUShort; // sal_uInt16 aUShort;
sal_uInt32 aULong; // sal_uInt32 aULong;
switch( mode) switch( mode)
{ {
...@@ -1590,8 +1591,8 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac ...@@ -1590,8 +1591,8 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
sal_Int8 aByte; sal_Int8 aByte;
sal_Int16 aShort; sal_Int16 aShort;
sal_Int32 aLong; sal_Int32 aLong;
sal_uInt16 aUShort; // sal_uInt16 aUShort;
sal_uInt32 aULong; // sal_uInt32 aULong;
xCallback->outValuesAll( xSimple, aSimpleStruct, aSimpleEnum, seqAny, aAny, aBool, xCallback->outValuesAll( xSimple, aSimpleStruct, aSimpleEnum, seqAny, aAny, aBool,
aChar, aString, aChar, aString,
aFloat, aDouble, aFloat, aDouble,
...@@ -1731,7 +1732,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac ...@@ -1731,7 +1732,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
} }
case 108: case 108:
{ {
float f= 3.14; float f= 3.14f;
xCallback->inoutFloat(f); xCallback->inoutFloat(f);
char buff[1024]; char buff[1024];
sprintf( buff, "out value float: %f", f); sprintf( buff, "out value float: %f", f);
...@@ -1811,7 +1812,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac ...@@ -1811,7 +1812,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
sal_Bool aBool= sal_True; sal_Bool aBool= sal_True;
sal_Unicode aChar= L'A'; sal_Unicode aChar= L'A';
OUString aString( L"OleTest"); OUString aString( L"OleTest");
float aFloat=3.14; float aFloat=3.14f;
double aDouble= 3.145; double aDouble= 3.145;
sal_Int8 aByte= 0xf; sal_Int8 aByte= 0xf;
sal_Int16 aShort= 0xff; sal_Int16 aShort= 0xff;
...@@ -1981,15 +1982,15 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac ...@@ -1981,15 +1982,15 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
arAny[6] <<= L'B'; arAny[6] <<= L'B';
OUString stringParam(L" a string parameter"); OUString stringParam(L" a string parameter");
arAny[7] <<= stringParam; arAny[7] <<= stringParam;
float _float= 3.14; float _float= 3.14f;
arAny[8] <<= _float; arAny[8] <<= _float;
double _double= 3.145; double _double= 3.145;
arAny[9] <<= _double; arAny[9] <<= _double;
sal_Int8 _byte= 0xff; sal_Int8 _byte= -1;
arAny[10] <<= _byte; arAny[10] <<= _byte;
sal_Int16 _short= 0xffff; sal_Int16 _short= -1;
arAny[11] <<= _short; arAny[11] <<= _short;
sal_Int32 _long= 0xffffffff; sal_Int32 _long= -1;
arAny[12] <<= _long; arAny[12] <<= _long;
// //
Sequence<Any> params( arAny, 13); Sequence<Any> params( arAny, 13);
...@@ -2089,7 +2090,7 @@ Reference< XInterface > SAL_CALL OComponent::getThis( ) throw (RuntimeException ...@@ -2089,7 +2090,7 @@ Reference< XInterface > SAL_CALL OComponent::getThis( ) throw (RuntimeException
return ret; return ret;
} }
void SAL_CALL EventListener::disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException) void SAL_CALL EventListener::disposing( const ::com::sun::star::lang::EventObject& ) throw (RuntimeException)
{ {
bCalled= sal_True; bCalled= sal_True;
} }
......
extensions/test/ole/cpptest/StdAfx.cpp deleted 100644 → 0
Dosyayı görüntüle @ a7b1047c
This diff is collapsed.
extensions/test/ole/cpptest/StdAfx.h deleted 100644 → 0
Dosyayı görüntüle @ a7b1047c
This diff is collapsed.
extensions/test/ole/cpptest/cpptest.cpp deleted 100644 → 0
Dosyayı görüntüle @ a7b1047c
This diff is collapsed.
extensions/test/ole/cpptest/cpptest.dsp deleted 100644 → 0
Dosyayı görüntüle @ a7b1047c
This diff is collapsed.
extensions/test/ole/cpptest/cpptest.dsw deleted 100644 → 0
Dosyayı görüntüle @ a7b1047c
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment