gcc3 corrections

This commit is contained in:
Jens-Heiner Rechtien 2001-11-07 10:12:32 +00:00
parent caf04f04d8
commit 2001d389a7
5 changed files with 27 additions and 27 deletions

View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.13 $
# $Revision: 1.14 $
#
# last change: $Author: hr $ $Date: 2001-10-31 16:18:25 $
# last change: $Author: hr $ $Date: 2001-11-07 11:10:14 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -112,17 +112,6 @@ SLOFILES= \
LIB1TARGET=$(SLB)$/cfg_test.lib
LIB1OBJFILES=$(SLOFILES)
SHL1TARGET=cfg_test
SHL1STDLIBS= \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
SHL1VERSIONMAP=$(SHL1TARGET).map
SHL1DEPN=
SHL1IMPLIB=i$(SHL1TARGET)
SHL1LIBS=$(SLB)$/$(SHL1TARGET).lib
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
APP3OBJS = $(OBJ)$/cfg_test.obj
APP3STDLIBS += $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB)

View file

@ -2,9 +2,9 @@
*
* $RCSfile: testhelper.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: dbo $ $Date: 2001-08-31 09:12:21 $
* last change: $Author: hr $ $Date: 2001-11-07 11:10:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -134,7 +134,7 @@ int __cdecl main( int argc, char * argv[] )
test_ImplHelper( x );
testPropertyTypeHelper();
testidlclass( x );
test_PropertySetHelper();
// test_PropertySetHelper();
test_interfacecontainer();
}
catch (Exception & rExc)

View file

@ -2,9 +2,9 @@
*
* $RCSfile: testpropshlp.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: hr $ $Date: 2001-10-31 16:18:25 $
* last change: $Author: hr $ $Date: 2001-11-07 11:10:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -414,8 +414,9 @@ public:
sal_Int32 nPropCount;
protected:
IPropertyArrayHelper & SAL_CALL getInfoHelper() throw(RuntimeException);
sal_Bool SAL_CALL convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue,
sal_Int32 nHandle, const Any& rValue )
sal_Bool SAL_CALL convertFastPropertyValue(
Any & rConvertedValue, Any & rOldValue,
sal_Int32 nHandle, const Any& rValue )
throw(IllegalArgumentException);
void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(RuntimeException);
void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw(RuntimeException);

View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.14 $
# $Revision: 1.15 $
#
# last change: $Author: dbo $ $Date: 2001-09-11 09:30:07 $
# last change: $Author: hr $ $Date: 2001-11-07 11:12:32 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -224,7 +224,7 @@ FACTORYTYPES:= -T com.sun.star.lang.XSingleComponentFactory \
-T com.sun.star.lang.XSingleServiceFactory\
-T com.sun.star.lang.XServiceInfo
TESTCOREFL:=ModuleC;ModuleC.XInterfaceA;ModuleC.XInterfaceB;ModuleA.XInterface1;com.sun.star.reflection.XIdlReflection;com.sun.star.reflection.XIdlField;com.sun.star.reflection.XIdlArray;com.sun.star.reflection.XIdlMethod;com.sun.star.reflection.XIdlClass;com.sun.star.beans.XPropertySet;com.sun.star.lang.XComponent;com.sun.star.container.XHierarchicalNameAccess
TESTCOREFL:=ModuleC;ModuleC.XInterfaceA;ModuleC.XInterfaceB;ModuleA.XInterface1;com.sun.star.reflection.XIdlReflection;com.sun.star.reflection.XIdlField;com.sun.star.reflection.XIdlArray;com.sun.star.reflection.XIdlMethod;com.sun.star.reflection.XIdlClass;com.sun.star.beans.XPropertySet;com.sun.star.lang.XComponent;com.sun.star.container.XHierarchicalNameAccess;com.sun.star.reflection.XIdlField2
TESTIADAPTER:=com.sun.star.beans.XIntrospection;com.sun.star.beans.MethodConcept;com.sun.star.beans.XExactName;com.sun.star.lang.XTypeProvider;com.sun.star.uno.XAggregation;com.sun.star.script.XInvocationAdapterFactory;com.sun.star.script.XInvocation;com.sun.star.lang.XMultiServiceFactory;com.sun.star.registry.XSimpleRegistry;com.sun.star.lang.XInitialization;test.XLanguageBindingTest
TESTINTROSP:=ModuleA;ModuleA.XIntroTest;com.sun.star.beans.XPropertySet;com.sun.star.container.XIndexAccess;com.sun.star.container.XNameAccess;com.sun.star.beans.PropertyAttribute;com.sun.star.beans.PropertyConcept
TESTCONV:=com.sun.star.script.XTypeConverter

View file

@ -2,9 +2,9 @@
*
* $RCSfile: testcorefl.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: hr $ $Date: 2001-10-31 16:02:09 $
* last change: $Author: hr $ $Date: 2001-11-07 11:12:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -79,6 +79,7 @@
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/reflection/XIdlReflection.hpp>
#include <com/sun/star/reflection/XIdlField2.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
#include <com/sun/star/registry/XImplementationRegistration.hpp>
@ -262,7 +263,8 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
TEST_ENSHURE(*(sal_Int32*)xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA") ))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->get(
Any(&aStructC, ::getCppuType( (const StructC *)0 ))).getValue() == aConstLong, "test_RegCoreReflection(): error 52");
TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleA.StructA"))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->getAccessMode() == FieldAccessMode_READWRITE, "test_RegCoreReflection(): error 52a");
xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC") ))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->set(aStructAny, aAny);
Reference< XIdlField2 > rField ( xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC") ))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") )) , UNO_QUERY );
rField->set(aStructAny, aAny);
TEST_ENSHURE(*(sal_Int32*)xRefl->forName(OUString::createFromAscii("ModuleA.StructB"))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->get(aStructAny).getValue() == *(sal_Int32*)aAny.getValue(), "test_RegCoreReflection(): error 53");
xRefl->forName( OUString::createFromAscii("[]ModuleA.StructA") )->createObject(aAny);
@ -285,6 +287,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
try
{
fprintf( stderr, "%1\n" );
Any bla = xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->get(Any());
TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 63");
return sal_False;
@ -295,10 +298,13 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
try
{
fprintf( stderr, "%2\n" );
Any blup;
blup <<= aStructC;
Any gulp;
xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp);
rField = Reference< XIdlField2 > ( xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString")) , UNO_QUERY);
rField->set( blup, gulp);
// xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp);
TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 64");
return sal_False;
}
@ -308,10 +314,13 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
try
{
fprintf( stderr, "%3\n" );
Any gulp;
gulp <<= 3.14f;
Any blup;
blup <<= aStructC;
rField = Reference< XIdlField2 > (
xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString")) , UNO_QUERY);
xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp);
TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 65");
return sal_False;
@ -331,6 +340,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
try
{
Sequence< Any > params;
fprintf( stderr, "%4\n" );
Any a;
a <<= xAI;