summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--stoc/test/testcorefl.cxx12
-rw-r--r--stoc/test/testcorefl.idl2
-rw-r--r--stoc/test/testiadapter.cxx7
-rw-r--r--stoc/test/testintrosp.cxx37
-rw-r--r--stoc/test/testsmgr_cpnt.cxx2
5 files changed, 20 insertions, 40 deletions
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 55f303b2d1ef..213989abb6ae 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -100,8 +100,6 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstUShort")) == aConstUShort, "test_RegCoreReflection(): error 4i");
OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstLong")) == aConstLong, "test_RegCoreReflection(): error 4k");
OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstULong")) == aConstULong, "test_RegCoreReflection(): error 4m");
-// OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstFloat")) == aConstFloat, "test_RegCoreReflection(): error 4o");
-// OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstDouble")) == aConstDouble, "test_RegCoreReflection(): error 4q");
// Enums
@@ -229,15 +227,6 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
OSL_ENSURE( aAny.getValueTypeName() == "[][]ModuleA.StructA", "test_RegCoreReflection(): error 56" );
-// xClass = xRefl->forName(OUString( "com.sun.star.beans.XIntroTest" ));
-
-// OSL_ENSURE(xClass.is(), "test_RegCoreReflection(): error 58");
-// OSL_ENSURE(xClass->getMethod(OUString("getStrings"))->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 59");
-// OSL_ENSURE(xClass->getMethod(OUString("getStrings"))->getReturnType()->getComponentType()->getName() == OUString("string"), "test_RegCoreReflection(): error 60");
-
-// xClass->getMethod(OUString("getStrings"))->getReturnType()->createObject(aAny);
-// OSL_ENSURE( aAny.getValueTypeName() == "[]string", "test_RegCoreReflection(): error 61" );
-
OSL_ENSURE(xRefl->forName(OUString("[][][]unsigned long"))->getComponentType()->getComponentType()->getComponentType()->getTypeClass() == TypeClass_UNSIGNED_LONG, "test_RegCoreReflection(): error 62");
try
@@ -259,7 +248,6 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl )
Any gulp;
rField = Reference< XIdlField2 > ( xRefl->forName(OUString("ModuleA.StructC"))->getField(OUString("aString")) , UNO_QUERY);
rField->set( blup, gulp);
-// xRefl->forName(OUString("ModuleA.StructC"))->getField(OUString("aString"))->set(blup, gulp);
OSL_ENSURE(sal_False, "test_RegCoreReflection(): error 64");
return sal_False;
}
diff --git a/stoc/test/testcorefl.idl b/stoc/test/testcorefl.idl
index 03605a5c7d56..9ad7a2ab3e41 100644
--- a/stoc/test/testcorefl.idl
+++ b/stoc/test/testcorefl.idl
@@ -71,8 +71,6 @@ module ModuleC
const unsigned short aConstUShort = 1;
const long aConstLong = -2;
const unsigned long aConstULong = 2;
-// const hyper aConstHyper = -3;
-// const unsigned hyper aConstUHyper = 3;
const float aConstFloat = 3.14;
const double aConstDouble = 3.14e-10;
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 9aaa29decc81..4daabdc1e92c 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -899,7 +899,6 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
catch (const IllegalArgumentException &aExc)
{
OSL_ENSURE( aExc.ArgumentPosition == 5 &&
-// aExc.Context == xLBT &&
aExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")),
"### unexpected exception content!" );
@@ -915,7 +914,7 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
}
catch (const RuntimeException & rExc)
{
- OSL_ENSURE(//rExc.Context == xLBT &&
+ OSL_ENSURE(
rExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")),
"### unexpected exception content!" );
@@ -931,10 +930,10 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
}
catch (const Exception & aExc)
{
- OSL_ENSURE( //aExc.Context == xLBT &&
+ OSL_ENSURE(
aExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")),
"### unexpected exception content!" );
- return (//aExc.Context == xLBT &&
+ return (
aExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")));
}
return sal_False;
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index e7c6b85c6c27..b583ebc6169d 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -65,14 +65,14 @@ typedef WeakImplHelper1< XPropertySetInfo > ImplPropertySetInfoHelper;
#define DEFAULT_INDEX_ACCESS_COUNT 10
#define DEFAULT_NAME_ACCESS_COUNT 5
-//**************************************************************
-//*** Hilfs-Funktion, um vom Type eine XIdlClass zu bekommen ***
-//**************************************************************
+//*******************************************************************
+//*** Auxiliary function, in order to get from one type XIdlClass ***
+//*******************************************************************
Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference< XMultiServiceFactory > & xMgr )
{
static Reference< XIdlReflection > xRefl;
- // void als Default-Klasse eintragen
+ // register void as default class
Reference<XIdlClass> xRetClass;
typelib_TypeDescription * pTD = 0;
rType.getDescription( &pTD );
@@ -342,7 +342,7 @@ public:
throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{}
- // XIntroTest-Methoden
+ // XIntroTest methods
// Attributes
virtual OUString SAL_CALL getObjectName() throw(RuntimeException)
{ return m_ObjectName; }
@@ -415,7 +415,7 @@ public:
virtual sal_Bool SAL_CALL hasElements( )
throw(RuntimeException);
- // XNameAccess-Methoden
+ // XNameAccess methods
// Methods
virtual Any SAL_CALL getByName( const OUString& aName )
throw(NoSuchElementException, WrappedTargetException, RuntimeException);
@@ -424,7 +424,7 @@ public:
virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
throw(RuntimeException);
- // XIndexAccess-Methoden
+ // XIndexAccess methods
// Methods
virtual sal_Int32 SAL_CALL getCount( )
throw(RuntimeException);
@@ -440,7 +440,7 @@ void ImplIntroTest::Init( void )
aName += OUString::valueOf( nObjCount );
setObjectName( aName );
- // Properties initialisieren
+ // Properties initialization
aAnyArray[0] <<= 3.14;
aAnyArray[1] <<= (sal_Int32)42;
aAnyArray[2] <<= OUString( OUString("Hallo") );
@@ -459,14 +459,14 @@ void ImplIntroTest::Init( void )
m_nLaber = 1;
eTypeClass = TypeClass_INTERFACE;
- // String-Sequence intitialisieren
+ // String-Sequence initialization
aStringSeq.realloc( 3 );
OUString* pStr = aStringSeq.getArray();
pStr[ 0 ] = OUString( OUString("String 0") );
pStr[ 1 ] = OUString( OUString("String 1") );
pStr[ 2 ] = OUString( OUString("String 2") );
- // structs initialisieren
+ // structs initialization
m_aFirstStruct.Name = OUString("FirstStruct-Name");
m_aFirstStruct.Handle = 77777;
//XIdlClassRef Type;
@@ -489,8 +489,8 @@ Reference< XPropertySetInfo > ImplIntroTest::getPropertySetInfo()
throw(RuntimeException)
{
static ImplPropertySetInfo aInfo( mxMgr );
- // Alle Objekt haben die gleichen Properties, deshalb kann
- // die Info für alle gleich sein
+ // All objects have the same Properties, so
+ // the Info is the same for all
return &aInfo;
}
@@ -560,15 +560,13 @@ Reference< XIntroTest > ImplIntroTest::getIntroTest()
return m_xIntroTest;
}
-// Methoden von XElementAccess
+// Methods of XElementAccess
Type ImplIntroTest::getElementType( )
throw(RuntimeException)
{
// TODO
Type aRetType;
return aRetType;
- //return Reference< XIdlClass >();
- //return Void_getReflection()->getIdlClass();
}
sal_Bool ImplIntroTest::hasElements( )
@@ -577,7 +575,7 @@ sal_Bool ImplIntroTest::hasElements( )
return sal_True;
}
-// XNameAccess-Methoden
+// XNameAccess methods
sal_Int32 getIndexForName( const OUString& ItemName )
{
OUString aLeftStr = ItemName.copy( 0, 4 );
@@ -585,9 +583,6 @@ sal_Int32 getIndexForName( const OUString& ItemName )
{
// TODO
OUString aNumStr = ItemName.copy( 4 );
- //sal_Int32 iIndex = (INT32)UStringToString( aNumStr, CHARSET_SYSTEM );
- //if( iIndex < DEFAULT_NAME_ACCESS_COUNT )
- //return iIndex;
}
return -1;
}
@@ -639,7 +634,7 @@ sal_Bool ImplIntroTest::hasByName( const OUString& aName )
return ( getIndexForName( aName ) != -1 );
}
-// XIndexAccess-Methoden
+// XIndexAccess methods
sal_Int32 ImplIntroTest::getCount( )
throw(RuntimeException)
{
@@ -864,7 +859,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
//******************************************************
- // Test-Objekt anlegen
+ // create Test object
Any aObjAny = getIntrospectionTestObject( xMgr );
// Introspection-Service unspecten
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index fe4a701fb946..7f6ece41f2a0 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -110,7 +110,7 @@ Test_Manager_Impl::~Test_Manager_Impl()
}
-// alt, wird von der neuen Mimic nicht mehr gebraucht
+// old, is no longer needed by the new Mimic
Reference< XInterface > SAL_CALL Test_Manager_Impl_CreateInstance_Impl()
{
return (OWeakObject *)new Test_Manager_Impl();