diff options
Diffstat (limited to 'testtools/source/bridgetest')
| -rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 34 | ||||
| -rw-r--r-- | testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx | 106 | ||||
| -rw-r--r-- | testtools/source/bridgetest/constructors.cxx | 10 | ||||
| -rw-r--r-- | testtools/source/bridgetest/cppobj.cxx | 62 | ||||
| -rw-r--r-- | testtools/source/bridgetest/currentcontextchecker.cxx | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/currentcontextchecker.hxx | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/idl/bridgetest.idl | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/multi.cxx | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/multi.hxx | 2 |
9 files changed, 111 insertions, 111 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 3ed8349df2e5..2696217824ef 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,8 +72,8 @@ using namespace com::sun::star::registry; using namespace com::sun::star::bridge; using namespace test::testtools::bridgetest; -#define SERVICENAME "com.sun.star.test.bridge.BridgeTest" -#define IMPLNAME "com.sun.star.comp.bridge.BridgeTest" +#define SERVICENAME "com.sun.star.test.bridge.BridgeTest" +#define IMPLNAME "com.sun.star.comp.bridge.BridgeTest" #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define STRING_TEST_CONSTANT "\" paco\' chorizo\\\' \"\'" @@ -477,7 +477,7 @@ static sal_Bool performTest( TestElement temp = aRet.Sequence[ 0 ]; aRet.Sequence[ 0 ] = aRet.Sequence[ 1 ]; aRet.Sequence[ 1 ] = temp; - + bRet = check( equals( aData, aSV2ret ) && equals( aData, aRet2 ), "getValues2 test") && bRet; @@ -738,7 +738,7 @@ static sal_Bool performTest( { _arSeqLong[i] = Sequence<sal_Int32>(_arLong, 3); } - + _arSeqLong2[j] = Sequence< Sequence<sal_Int32> > (_arSeqLong, 3); } @@ -798,7 +798,7 @@ static sal_Bool performTest( Sequence<Any> arAnyTemp = cloneSequence(arAny); Sequence<Sequence<sal_Int32> > arLong2Temp(arLong3[0]); Sequence<Sequence<Sequence<sal_Int32> > > arLong3Temp(arLong3); - + xBT2->setSequencesInOut(arBoolTemp, arCharTemp, arByteTemp, arShortTemp, arUShortTemp, arLongTemp,arULongTemp, arHyperTemp, arUHyperTemp, arFloatTemp, arDoubleTemp, @@ -1006,7 +1006,7 @@ static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT ) { #ifdef COMPCHECK //When we check if a new compiler still works then we must not call - //getRuntimeException because it uses cppu::getCaughtException which + //getRuntimeException because it uses cppu::getCaughtException which //does only work if all libs are build with the same runtime. return true; #else @@ -1075,8 +1075,8 @@ uno_Sequence* cloneSequence(const uno_Sequence* val, const Type& type) typelib_TypeDescription* pTdElem = pIndirectTd->pType->pType; sal_Int8* buf = new sal_Int8[pTdElem->nSize * val->nElements]; sal_Int8* pBufCur = buf; - - uno_Sequence* retSeq = NULL; + + uno_Sequence* retSeq = NULL; switch (pTdElem->eTypeClass) { case TypeClass_SEQUENCE: @@ -1099,7 +1099,7 @@ uno_Sequence* cloneSequence(const uno_Sequence* val, const Type& type) break; } delete[] buf; - return retSeq; + return retSeq; } template< class T> @@ -1116,11 +1116,11 @@ inline bool makeSurrogate( rOut.clear(); if (! rOriginal.is()) return false; - + Environment aCppEnv_official; Environment aUnoEnv_ano; Environment aCppEnv_ano; - + OUString aCppEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ); OUString aUnoEnvTypeName( @@ -1136,7 +1136,7 @@ inline bool makeSurrogate( uno_createEnvironment( reinterpret_cast< uno_Environment ** >( &aUnoEnv_ano ), aUnoEnvTypeName.pData, 0 ); - + UnoInterfaceReference unoI; Mapping cpp2uno( aCppEnv_official.get(), aUnoEnv_ano.get() ); Mapping uno2cpp( aUnoEnv_ano.get(), aCppEnv_ano.get() ); @@ -1164,7 +1164,7 @@ inline bool makeSurrogate( OUSTR("mapping binary UNO to C++ failed!"), Reference< XInterface >() ); } - + return rOut.is(); } @@ -1225,7 +1225,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) break; } } - + if (! xOriginal.is()) { throw RuntimeException( @@ -1272,7 +1272,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) { printf( "\n> ### test failed!\n" ); } - + return 0; } @@ -1357,7 +1357,7 @@ void * SAL_CALL component_getFactory( bridge_test::TestBridgeImpl_create, OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ), bridge_test::getSupportedServiceNames() ) ); - + if (xFactory.is()) { xFactory->acquire(); diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx index 3de10604d0e4..ab49129165ee 100644 --- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx +++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,14 +68,14 @@ namespace cpp_bridgetest { nToCall --; xCall->callRecursivly(this, nToCall); - } + } } } __finally { Monitor::Exit(this); } - + } }; @@ -84,7 +84,7 @@ public __gc class Constants public: static String* STRING_TEST_CONSTANT = new String(S"\" paco\' chorizo\\\' \"\'"); }; - + public __gc class BridgeTest : public WeakBase, public XMain { static bool compareData(Object* val1, Object* val2) @@ -94,7 +94,7 @@ public __gc class BridgeTest : public WeakBase, public XMain if ((val1 == 0 && val2 != 0) || (val1 != 0 && val2 == 0) || val1->GetType() != val2->GetType()) return false; - + bool ret = false; Type* t1 = val1->GetType(); //Sequence @@ -111,9 +111,9 @@ public __gc class BridgeTest : public WeakBase, public XMain // Interface implementation else if (t1->GetInterfaces()->Length > 0 && ! t1->IsValueType) { - ret = val1 == val2; - } - // Struct + ret = val1 == val2; + } + // Struct else if ( ! t1->IsValueType) { ret = compareStruct(val1, val2); @@ -132,7 +132,7 @@ public __gc class BridgeTest : public WeakBase, public XMain else { Debug::Assert(false); - } + } return ret; } @@ -142,8 +142,8 @@ public __gc class BridgeTest : public WeakBase, public XMain Debug::Assert(ar1 != 0 && ar2 != 0); Type* t1 = ar1->GetType(); Type* t2 = ar2->GetType(); - - if (!(ar1->Rank == 1 && ar2->Rank == 1 + + if (!(ar1->Rank == 1 && ar2->Rank == 1 && ar1->Length == ar2->Length && t1->GetElementType() == t2->GetElementType())) return false; @@ -208,7 +208,7 @@ public __gc class BridgeTest : public WeakBase, public XMain check( rData1->String == rData2->String, "### string does not match!" ); check( rData1->Interface == rData2->Interface, "### interface does not match!" ); check( compareData(__box(rData1->Any), __box(rData2->Any)), "### any does not match!" ); - + return (rData1->Bool == rData2->Bool && rData1->Char == rData2->Char && rData1->Byte == rData2->Byte && @@ -318,7 +318,7 @@ static bool performAnyTest(XBridgeTest* xLBT, TestDataElements* data) Any a2 = xLBT->transportAny(a1); bReturn = compareData( __box(a2), __box(a1)) && bReturn; } - return bReturn; + return bReturn; } static bool performSequenceOfCallTest(XBridgeTest* xLBT) @@ -355,7 +355,7 @@ static bool performRecursiveCallTest(XBridgeTest* xLBT) static bool performQueryForUnknownType(XBridgeTest* xLBT) { bool bRet = false; - // test queryInterface for an unknown type + // test queryInterface for an unknown type try { __try_cast<foo::MyInterface*>(xLBT); @@ -377,7 +377,7 @@ static bool performTest(XBridgeTest* xLBT) { // this data is never ever granted access to by calls other than equals(), assign()! TestDataElements* aData = new TestDataElements(); // test against this data - + Object* xI= new WeakBase(); Any aAny( __typeof(Object), xI); @@ -390,39 +390,39 @@ static bool performTest(XBridgeTest* xLBT) bRet = check( aData->Any.Value == xI, "### unexpected any!" ) && bRet; bRet = check( !(aData->Any.Value != xI), "### unexpected any!" ) && bRet; - + aData->Sequence = new TestElement*[2]; aData->Sequence[0] = new TestElement( aData->Bool, aData->Char, aData->Byte, aData->Short, - aData->UShort, aData->Long, aData->ULong, - aData->Hyper, aData->UHyper, aData->Float, - aData->Double, aData->Enum, aData->String, + aData->UShort, aData->Long, aData->ULong, + aData->Hyper, aData->UHyper, aData->Float, + aData->Double, aData->Enum, aData->String, aData->Interface, aData->Any); //(TestElement) aData; aData->Sequence[1] = new TestElement(); //is empty - + // aData complete // // this is a manually copy of aData for first setting... TestDataElements* aSetData = new TestDataElements; Any aAnySet(__typeof(Object), xI); assign( static_cast<TestElement*>(aSetData), - aData->Bool, - aData->Char, - aData->Byte, - aData->Short, + aData->Bool, + aData->Char, + aData->Byte, + aData->Short, aData->UShort, aData->Long, aData->ULong, aData->Hyper, aData->UHyper, aData->Float, aData->Double, - aData->Enum, - aData->String, + aData->Enum, + aData->String, xI, aAnySet); - + aSetData->Sequence = new TestElement*[2]; aSetData->Sequence[0] = new TestElement( aSetData->Bool, aSetData->Char, aSetData->Byte, aSetData->Short, - aSetData->UShort, aSetData->Long, aSetData->ULong, - aSetData->Hyper, aSetData->UHyper, aSetData->Float, - aSetData->Double, aSetData->Enum, aSetData->String, + aSetData->UShort, aSetData->Long, aSetData->ULong, + aSetData->Hyper, aSetData->UHyper, aSetData->Float, + aSetData->Double, aSetData->Enum, aSetData->String, aSetData->Interface, aSetData->Any); //TestElement) aSetData; aSetData->Sequence[1] = new TestElement(); // empty struct @@ -430,7 +430,7 @@ static bool performTest(XBridgeTest* xLBT) aSetData->Bool, aSetData->Char, aSetData->Byte, aSetData->Short, aSetData->UShort, aSetData->Long, aSetData->ULong, aSetData->Hyper, aSetData->UHyper, aSetData->Float, aSetData->Double, aSetData->Enum, aSetData->String, aSetData->Interface, aSetData->Any, aSetData->Sequence, aSetData ); - + { TestDataElements* aRet = new TestDataElements(); TestDataElements* aRet2 = new TestDataElements(); @@ -439,22 +439,22 @@ static bool performTest(XBridgeTest* xLBT) & aRet->Long, & aRet->ULong, & aRet->Hyper, & aRet->UHyper, & aRet->Float, & aRet->Double, & aRet->Enum, & aRet->String, & aRet->Interface, & aRet->Any, & aRet->Sequence, & aRet2 ); - + bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) , "getValues test") && bRet; - + // set last retrieved values TestDataElements* aSV2ret = xLBT->setValues2( & aRet->Bool, & aRet->Char, & aRet->Byte, & aRet->Short, & aRet->UShort, & aRet->Long, & aRet->ULong, & aRet->Hyper, & aRet->UHyper, & aRet->Float, & aRet->Double, & aRet->Enum, & aRet->String, & aRet->Interface, & aRet->Any, & aRet->Sequence, & aRet2 ); - + // check inout sequence order // => inout sequence parameter was switched by test objects TestElement* temp = aRet->Sequence[ 0 ]; aRet->Sequence[ 0 ] = aRet->Sequence[ 1 ]; aRet->Sequence[ 1 ] = temp; - + bRet = check( compareData( aData, aSV2ret ) && compareData( aData, aRet2 ), "getValues2 test") && bRet; @@ -468,9 +468,9 @@ static bool performTest(XBridgeTest* xLBT) & aRet->UHyper, & aRet->Float, & aRet->Double, & aRet->Enum, & aRet->String, & aRet->Interface, & aRet->Any, & aRet->Sequence, & aRet2 ); - + bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) && compareData( aData, aGVret ), "getValues test" ) && bRet; - + // set last retrieved values xLBT->Bool = aRet->Bool; xLBT->Char = aRet->Char; @@ -510,7 +510,7 @@ static bool performTest(XBridgeTest* xLBT) aRet->Any = xLBT->Any; aRet->Sequence = xLBT->Sequence; aRet2 = xLBT->Struct; - + bRet = check( compareData( aData, aRet ) && compareData( aData, aRet2 ) , "struct comparison test") && bRet; bRet = check(performSequenceTest(xLBT), "sequence test") && bRet; @@ -523,7 +523,7 @@ static bool performTest(XBridgeTest* xLBT) // recursive call test bRet = check( performRecursiveCallTest( xLBT ) , "recursive test" ) && bRet; - + bRet = (compareData( aData, aRet ) && compareData( aData, aRet2 )) && bRet ; // check setting of null reference @@ -532,7 +532,7 @@ static bool performTest(XBridgeTest* xLBT) bRet = (aRet->Interface == 0) && bRet; } - + } return bRet; @@ -583,13 +583,13 @@ static bool performSequenceTest(XBridgeTest* xBT) //TestEnum arEnum[] = new TestEnum[3]; //arEnum[0] = TestEnum::ONE; arEnum[1] = TestEnum::TWO; //arEnum[2] = TestEnum::CHECK; - Console::WriteLine(new String("cli_cpp_bridgetest: Workaround for C++ compiler bug:" + Console::WriteLine(new String("cli_cpp_bridgetest: Workaround for C++ compiler bug:" " using Array of Int32 instead of Array of enums w")); Int32 arEnum[] = new Int32[3]; arEnum[0] = static_cast<Int32>(TestEnum::ONE); arEnum[1] = static_cast<Int32>(TestEnum::TWO); arEnum[2] = static_cast<Int32>(TestEnum::CHECK); - + TestElement* arStruct[] = new TestElement*[3]; arStruct[0] = new TestElement(); arStruct[1] = new TestElement(); arStruct[2] = new TestElement(); @@ -606,7 +606,7 @@ static bool performSequenceTest(XBridgeTest* xBT) TestEnum::CHECK, Constants::STRING_TEST_CONSTANT, arObject[2], Any( __typeof(Object), arObject[2] ) ); - + // int[][][] arLong3 = new int[][][]{ // new int[][]{new int[]{1,2,3},new int[]{4,5,6}, new int[]{7,8,9} }, // new int [][]{new int[]{1,2,3},new int[]{4,5,6}, new int[]{7,8,9}}, @@ -614,7 +614,7 @@ static bool performSequenceTest(XBridgeTest* xBT) { -// Console::WriteLine(new String("cli_cpp_bridgetest: +// Console::WriteLine(new String("cli_cpp_bridgetest: // int[][] seqSeqRet = xBT2->setDim2(arLong3[0]); // bRet = check( compareData(seqSeqRet, arLong3[0]), "sequence test") && bRet; // int[][][] seqSeqRet2 = xBT2->setDim3(arLong3); @@ -639,7 +639,7 @@ static bool performSequenceTest(XBridgeTest* xBT) Double seqDoubleRet[] = xBT2->setSequenceDouble(arDouble); bRet = check( compareData(seqDoubleRet, arDouble), "sequence test") && bRet; xBT2->setSequenceEnum(arEnum); - //comparing seqEnumRet with arEnum will fail since they are of different + //comparing seqEnumRet with arEnum will fail since they are of different //types because of workaround. arEnum is Int32[]. Console::WriteLine(new String("cli_cpp_bridgetest: Test omitted because " "of C++ compiler bug. XBridgeTest2::setSequenceEnum(sequence<TestEnum>)")); @@ -707,7 +707,7 @@ static bool performSequenceTest(XBridgeTest* xBT) // compareData(arAnyTemp , arAny) && // compareData(arLong2Temp , arLong3[0]) && // compareData(arLong3Temp , arLong3), "sequence test") && bRet; - + //Boolean arBoolOut[]; //Char arCharOut[]; //Byte arByteOut[]; @@ -788,7 +788,7 @@ static bool performSequenceTest(XBridgeTest* xBT) bRet = check( compareData(seqDoubleRet, _arDouble), "sequence test") && bRet; TestEnum _arEnum[] = new TestEnum[0]; xBT2->setSequenceEnum(_arEnum); -// compiler bug: _arEnum has type System.Enum and not TestEnum +// compiler bug: _arEnum has type System.Enum and not TestEnum // bRet = check( compareData(seqEnumRet, _arEnum), "sequence test") && bRet; UInt16 _arUShort[] = new UInt16[0]; UInt16 seqUShortRet[] = xBT2->setSequenceUShort(_arUShort); @@ -808,7 +808,7 @@ static bool performSequenceTest(XBridgeTest* xBT) TestElement* _arStruct[] = new TestElement*[0]; TestElement* seqStructRet[] = xBT2->setSequenceStruct(_arStruct); bRet = check( compareData(seqStructRet, _arStruct), "sequence test") && bRet; - + } return bRet; } @@ -880,7 +880,7 @@ static bool raiseException(XBridgeTest* xLBT ) { check( false, "### unexpected exception content!" ); } - + /** it is certain, that the RuntimeException testing will fail, if no */ xLBT->RuntimeException = 0; @@ -896,7 +896,7 @@ static bool raiseException(XBridgeTest* xLBT ) { check( false, "### unexpected exception content!" ); } - + /** it is certain, that the RuntimeException testing will fail, if no */ xLBT->RuntimeException = (int) 0xcafebabe; } @@ -938,9 +938,9 @@ static bool raiseException(XBridgeTest* xLBT ) { m_xContext = xContext; } + - - + int run( String* args[] ) { try @@ -955,7 +955,7 @@ static bool raiseException(XBridgeTest* xLBT ) args[ 0 ], m_xContext ); if (test_obj == 0) test_obj = m_xContext->getValueByName( args[ 0 ] ).Value; - + Console::WriteLine( "cli target bridgetest obj: {0}", test_obj->ToString() ); XBridgeTest* xTest = __try_cast<XBridgeTest*>(test_obj) ; diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index a7d8a96c1bf3..2b72372da599 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -290,13 +290,13 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) css::uno::Sequence<ttb::TestPolyStruct< ::sal_Int32> > arg35; css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any> > > arg36; css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2< - ttb::TestPolyStruct2< ::sal_Unicode,css::uno::Any >, ::rtl::OUString> > > arg37; + ttb::TestPolyStruct2< ::sal_Unicode,css::uno::Any >, ::rtl::OUString> > > arg37; css::uno::Sequence<ttb::TestPolyStruct2< ::rtl::OUString, ttb::TestPolyStruct2< ::sal_Unicode, ttb::TestPolyStruct<css::uno::Any> > > > arg38; css::uno::Sequence<ttb::TestPolyStruct2<ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any>, ttb::TestPolyStruct< ::sal_Unicode> > > arg39; css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct< ::sal_Unicode> > > arg40; - css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any> > > >arg41; + css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any> > > >arg41; css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct< ttb::TestPolyStruct2<ttb::TestPolyStruct2<sal_Unicode, css::uno::Any>, ::rtl::OUString> > > > arg42; css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct2< @@ -307,7 +307,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) if (!(arguments.getLength() == 45 && (arguments[0] >>= arg0) && arg0.member == cppu::UnoType<sal_Int32>::get() - && (arguments[1] >>= arg1) && arg1.member == arg1b + && (arguments[1] >>= arg1) && arg1.member == arg1b && (arguments[2] >>= arg2) && arg2.member == sal_True && (arguments[3] >>= arg3) && arg3.member == SAL_MIN_INT8 && (arguments[4] >>= arg4) && arg4.member == SAL_MIN_INT16 @@ -436,7 +436,7 @@ void Impl2::setatt1( double _att1 )throw (::com::sun::star::uno::RuntimeExceptio { m_attr1 = _att1; } - + ::sal_Int32 Impl2::fn11( ::sal_Int32 arg ) throw (::com::sun::star::uno::RuntimeException) { diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 587eacabbfc5..e41c5ad605bf 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,8 +66,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace test::testtools::bridgetest; -#define SERVICENAME "com.sun.star.test.bridge.CppTestObject" -#define IMPLNAME "com.sun.star.comp.bridge.CppTestObject" +#define SERVICENAME "com.sun.star.test.bridge.CppTestObject" +#define IMPLNAME "com.sun.star.comp.bridge.CppTestObject" namespace bridge_object { @@ -153,15 +153,15 @@ class Test_Impl : Sequence<Sequence<Sequence<sal_Int32> > > _arLong3; Sequence<Any> _arAny; Sequence<TestElement> _arStruct; - + public: Test_Impl() : m_nLastCallId( 0 ), m_bFirstCall( sal_True ), m_bSequenceOfCallTestPassed( sal_True ) {} virtual ~Test_Impl() - { - OSL_TRACE( "> scalar Test_Impl dtor <\n" ); + { + OSL_TRACE( "> scalar Test_Impl dtor <\n" ); } void SAL_CALL acquire() throw () @@ -172,12 +172,12 @@ public: { OWeakObject::release(); } - + // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); - + // XLBTestBase virtual void SAL_CALL setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int16 nShort, sal_uInt16 nUShort, @@ -190,7 +190,7 @@ public: const ::com::sun::star::uno::Sequence<TestElement >& rSequence, const TestData& rStruct ) throw(com::sun::star::uno::RuntimeException); - + virtual TestData SAL_CALL setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, @@ -202,7 +202,7 @@ public: ::com::sun::star::uno::Sequence<TestElement >& rSequence, TestData& rStruct ) throw(com::sun::star::uno::RuntimeException); - + virtual TestData SAL_CALL getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, @@ -225,7 +225,7 @@ public: { return rStruct; } virtual sal_Int32 SAL_CALL testPPCAlignment( sal_Int64, sal_Int64, sal_Int32, sal_Int64, sal_Int32 i2 ) throw(com::sun::star::uno::RuntimeException) { return i2; } - + virtual sal_Bool SAL_CALL getBool() throw(com::sun::star::uno::RuntimeException) { return _aData.Bool; } virtual sal_Int8 SAL_CALL getByte() throw(com::sun::star::uno::RuntimeException) @@ -371,13 +371,13 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL startRecursiveCall( const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException); virtual Reference< XMulti > SAL_CALL getMulti() throw (RuntimeException); virtual rtl::OUString SAL_CALL testMulti(Reference< XMulti > const & multi) throw (RuntimeException); - + public: // XBridgeTest virtual TestData SAL_CALL raiseException( sal_Int16 nArgumentPos, const OUString & rMsg, const Reference< XInterface > & xCOntext ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -385,7 +385,7 @@ public: // XBridgeTest virtual void SAL_CALL raiseRuntimeExceptionOneway( const ::rtl::OUString& Message, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context ) throw(::com::sun::star::uno::RuntimeException); - + virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) throw(::com::sun::star::uno::RuntimeException); @@ -480,7 +480,7 @@ class Dummy : protected osl::DebugBase<Dummy>, public WeakComponentImplHelperBase { public: - Dummy(): WeakComponentImplHelperBase(*Mutex::getGlobalMutex()){} + Dummy(): WeakComponentImplHelperBase(*Mutex::getGlobalMutex()){} }; //__________________________________________________________________________________________________ @@ -592,11 +592,11 @@ TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& n bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, rStr, xTest, rAny, rSequence ); _aStructData = rStruct; - + TestElement elem = rSequence[ 0 ]; rSequence[ 0 ] = rSequence[ 1 ]; rSequence[ 1 ] = elem; - + return _aStructData; } //__________________________________________________________________________________________________ @@ -637,8 +637,8 @@ TestData Test_Impl::raiseException( sal_Int16 nArgumentPos, const OUString & rMs { IllegalArgumentException aExc; aExc.ArgumentPosition = nArgumentPos; - aExc.Message = _aData.String = rMsg; - aExc.Context = _aData.Interface = xContext; + aExc.Message = _aData.String = rMsg; + aExc.Context = _aData.Interface = xContext; throw aExc; } @@ -646,8 +646,8 @@ void Test_Impl::raiseRuntimeExceptionOneway( const OUString & rMsg, const Refere throw(::com::sun::star::uno::RuntimeException) { RuntimeException aExc; - aExc.Message = _aData.String = rMsg; - aExc.Context = _aData.Interface = xContext; + aExc.Message = _aData.String = rMsg; + aExc.Context = _aData.Interface = xContext; throw aExc; } @@ -704,8 +704,8 @@ sal_Int32 Test_Impl::getRuntimeException() void Test_Impl::setRuntimeException( sal_Int32 ) throw(::com::sun::star::uno::RuntimeException) { RuntimeException aExc; - aExc.Message = _aData.String; - aExc.Context = _aData.Interface; + aExc.Message = _aData.String; + aExc.Context = _aData.Interface; throwException( makeAny( aExc ) ); } @@ -880,9 +880,9 @@ void SAL_CALL Test_Impl::setSequencesOut( Sequence< sal_Bool >& aSeqBoolean, Sequence< sal_Unicode >& aSeqChar, Sequence< sal_Int8 >& aSeqByte, Sequence< sal_Int16 >& aSeqShort, - Sequence< sal_uInt16 >& aSeqUShort, + Sequence< sal_uInt16 >& aSeqUShort, Sequence< sal_Int32 >& aSeqLong, - Sequence< sal_uInt32 >& aSeqULong, + Sequence< sal_uInt32 >& aSeqULong, Sequence< sal_Int64 >& aSeqHyper, Sequence< sal_uInt64 >& aSeqUHyper, Sequence< float >& aSeqFloat, @@ -1029,7 +1029,7 @@ void Test_Impl::testConstructorsService( Sequence<Type> argSeq1(1); argSeq1[0] = cppu::UnoType<sal_Int32>::get(); Sequence<Reference<XInterface> > argSeq2(1); argSeq2[0] = static_cast<XComponent*>(new Dummy()); Sequence<Reference<XComponent> > argSeq2a(1); argSeq2a[0] = static_cast<XComponent*>(new Dummy()); - + Sequence<TestPolyStruct2<sal_Unicode, Sequence<Any> > > argSeq3(1); argSeq3[0] = TestPolyStruct2<sal_Unicode, Sequence<Any> >('X', arg27); Sequence<TestPolyStruct2<TestPolyStruct<sal_Unicode>, Sequence<Any> > > argSeq4(1); @@ -1055,7 +1055,7 @@ void Test_Impl::testConstructorsService( TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), TestPolyStruct<sal_Unicode>('X')); Sequence<Sequence<TestPolyStruct<sal_Unicode > > > argSeq11(1); argSeq11[0] = Sequence<TestPolyStruct<sal_Unicode > >(1); - argSeq11[0][0] = TestPolyStruct<sal_Unicode>('X'); + argSeq11[0][0] = TestPolyStruct<sal_Unicode>('X'); Sequence<Sequence<TestPolyStruct<TestPolyStruct2<sal_Unicode,Any> > > > argSeq12(1); argSeq12[0] = Sequence<TestPolyStruct<TestPolyStruct2<sal_Unicode,Any> > >(1); argSeq12[0][0] = TestPolyStruct<TestPolyStruct2<sal_Unicode,Any> >( @@ -1193,7 +1193,7 @@ sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME "/UNO/SERVICES") ) ) ); xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) ) ); - + return sal_True; } catch (InvalidRegistryException &) @@ -1208,7 +1208,7 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; - + if (pServiceManager && rtl_str_compare( pImplName, IMPLNAME ) == 0) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( @@ -1216,14 +1216,14 @@ void * SAL_CALL component_getFactory( OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ), bridge_object::Test_Impl_create, bridge_object::getSupportedServiceNames() ) ); - + if (xFactory.is()) { xFactory->acquire(); pRet = xFactory.get(); } } - + return pRet; } } diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx index 38933d928b6a..7bdfbfba0d5e 100644 --- a/testtools/source/bridgetest/currentcontextchecker.cxx +++ b/testtools/source/bridgetest/currentcontextchecker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx b/testtools/source/bridgetest/currentcontextchecker.hxx index 4fbcbaf65ef0..542e9736eab2 100644 --- a/testtools/source/bridgetest/currentcontextchecker.hxx +++ b/testtools/source/bridgetest/currentcontextchecker.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/bridgetest/idl/bridgetest.idl b/testtools/source/bridgetest/idl/bridgetest.idl index 40a0066211ab..71e82c5b282d 100644 --- a/testtools/source/bridgetest/idl/bridgetest.idl +++ b/testtools/source/bridgetest/idl/bridgetest.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx index dd8558a29867..18a04889a83b 100644 --- a/testtools/source/bridgetest/multi.cxx +++ b/testtools/source/bridgetest/multi.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx index 3a73a6eb390a..f2ac06560d83 100644 --- a/testtools/source/bridgetest/multi.hxx +++ b/testtools/source/bridgetest/multi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |