summaryrefslogtreecommitdiffstats
path: root/extensions/test
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-04 17:57:31 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-06 13:43:35 +0100
commit50c26300e5b5ae9671f18a9e449516604d16105f (patch)
treee4f0cf83c41bbd70bbe6021f85b8e97815134f42 /extensions/test
parentmake (hopefully) more understandable (diff)
downloadcore-50c26300e5b5ae9671f18a9e449516604d16105f.tar.gz
core-50c26300e5b5ae9671f18a9e449516604d16105f.zip
Remove lots of dead code
Diffstat (limited to 'extensions/test')
-rw-r--r--extensions/test/ole/OleClient/clientTest.cxx6
-rw-r--r--extensions/test/ole/cpnt/cpnt.cxx150
-rw-r--r--extensions/test/ole/unloading/unloadTest.cxx12
3 files changed, 1 insertions, 167 deletions
diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx
index 684644e47cec..71049b7702c5 100644
--- a/extensions/test/ole/OleClient/clientTest.cxx
+++ b/extensions/test/ole/OleClient/clientTest.cxx
@@ -1240,12 +1240,6 @@ HRESULT doTest()
aAny <<= OUString( L" A string in an any");
aAny=invMfc->invoke( OUString(L"inVariant"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
- // Tests with Sequences later.
- // OUString arStr4[]= {L"string0", L"string1", L"string2"};
- // Sequence<OUString> seqStr4( arStr4, 3);
- // aAny <<= seqStr4;
- // invMfc->invoke( OUString(L"inArray"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
-
Reference < XInvocation > inv5= getComObject(L"AxTestComponents.Basic");
Any anyVal4;
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index eff03c8aedd4..14d6f0ffcd6a 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -280,29 +280,6 @@ public: // XTestSequence
virtual Any SAL_CALL other_methodAny( const Any& rAny, const OUString& typeInAny )
throw (RuntimeException);
-
- // XTestOutParameters ------------------------------------------------------------------------
-// virtual void SAL_CALL out_test(sal_Int8 rIn) throw( RuntimeException );
-
-// virtual void SAL_CALL out_methodByte(sal_Int8& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodFloat(float& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodDouble(double& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodBool(sal_Bool& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodShort(sal_Int16& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodUShort(sal_uInt16& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodLong(sal_Int32& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodULong(sal_uInt32& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodHyper(sal_Int64& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodUHyper(sal_uInt64& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodString(OUString& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodChar(sal_Unicode& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodAny(Any& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodSequence2(Sequence< Sequence< sal_Int32 > >& rOut) throw( RuntimeException );
-// virtual void SAL_CALL out_methodMulParams1(sal_Int32& rout1, sal_Int32& rout2) throw( RuntimeException );
-// virtual void SAL_CALL out_methodMulParams2(sal_Int32& rout1, sal_Int32& rout2, OUString& rout3) throw( RuntimeException );
-// virtual void SAL_CALL out_methodMulParams3(const OUString& sin, OUString& sout) throw( RuntimeException );
-
// XTestInParameters
virtual sal_Int8 SAL_CALL in_methodByte( sal_Int8 rIn ) throw (RuntimeException);
virtual float SAL_CALL in_methodFloat( float rIn ) throw (RuntimeException);
@@ -526,8 +503,7 @@ Sequence< Type > SAL_CALL OComponent::methodType(const Sequence< Type >& aSeq) t
}
return aSeq;
}
-//Sequence< Reference< XInterface> > SAL_CALL methodXInterface ( const Sequence< Reference < XInterface> >& aSeq)
-// throw (RuntimeException)
+
Sequence< Reference< XInterface > > SAL_CALL OComponent::methodXInterface( const Sequence< Reference< XInterface > >& aSeq ) throw(RuntimeException)
{
for( sal_Int32 i= 0; i < aSeq.getLength(); i++)
@@ -993,9 +969,6 @@ void SAL_CALL OComponent::testout_methodMulParams4( float in1, float& out1, sal_
void SAL_CALL OComponent::testout_methodXInterface( Reference< XInterface >& rOut ) throw(RuntimeException)
{
rOut = m_xinterface;
-// OUString string( L"Property Any");
-// m_any <<= string;
-// rOut= Reference<XInterface> (static_cast<XTestSequence*>(this), UNO_QUERY);
}
// XTestInParameters ------------------------------------------------------------
@@ -1250,17 +1223,6 @@ void SAL_CALL OComponent::testinout_methodXInterface2( Reference< XInterface > &
Reference<XInterface> tmp = rOut;
rOut = m_xinterface;
m_xinterface = tmp;
-// Reference<XTestSequence> xTest( rOut, UNO_QUERY);
-// if( xTest.is())
-// {
-// Any any= xTest->getAttrAny2();
-// OUString _s;
-// any >>= _s;
-// OUString string= _s + OUString((L" this string was written in the UNO component to the inout pararmeter"));
-// any <<= string;
-// xTest->setAttrAny2( any);
-// }
-
}
Any SAL_CALL OComponent::methodAnyTest1(const Any& rIn) throw( RuntimeException )
{
@@ -1360,94 +1322,6 @@ Any SAL_CALL OComponent::other_methodAny( const Any& rAny, const OUString& typeI
return rAny;
}
-// XTestOutParameters ============================================================================
-// void SAL_CALL OComponent::out_test(sal_Int8 rIn) throw( RuntimeException )
-// {
-// }
-
-// void SAL_CALL OComponent::out_methodByte(sal_Int8& rOut) throw( RuntimeException )
-// {
-// rOut= 100;
-// }
-
-// void SAL_CALL OComponent::out_methodDouble(double& rOut) throw( RuntimeException )
-// {
-// rOut= 3.14;
-// }
-// void SAL_CALL OComponent::out_methodFloat(float& rOut) throw( RuntimeException )
-// {
-// rOut= 3.14;
-// }
-// void SAL_CALL OComponent::out_methodBool(sal_Bool& rOut) throw( RuntimeException )
-// {
-// rOut= sal_True;
-// }
-// void SAL_CALL OComponent::out_methodShort(sal_Int16& rOut) throw( RuntimeException )
-// {
-// rOut= -100;
-// }
-// void SAL_CALL OComponent::out_methodUShort(sal_uInt16& rOut) throw( RuntimeException )
-// {
-// rOut= 100;
-// }
-// void SAL_CALL OComponent::out_methodLong(sal_Int32& rOut) throw( RuntimeException )
-// {
-// rOut= -100;
-// }
-
-// void SAL_CALL OComponent::out_methodULong(sal_uInt32& rOut) throw( RuntimeException )
-// {
-// rOut= 100;
-// }
-// void SAL_CALL OComponent::out_methodHyper(sal_Int64& rOut) throw( RuntimeException )
-// {
-
-// }
-
-// void SAL_CALL OComponent::out_methodUHyper(sal_uInt64& rOut) throw( RuntimeException )
-// {
-// }
-
-// void SAL_CALL OComponent::out_methodString(OUString& rOut) throw( RuntimeException )
-// {
-// rOut= L"I'm a string";
-// }
-// void SAL_CALL OComponent::out_methodChar(sal_Unicode& rOut) throw( RuntimeException )
-// {
-// rOut= 'A';
-// }
-// void SAL_CALL OComponent::out_methodAny(Any& rOut) throw( RuntimeException)
-// {
-// Any a;
-// a <<= OUString( L"Hi");
-// rOut= a;
-// }
-// void SAL_CALL OComponent::out_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException )
-// {
-// Sequence< sal_Int32 > aseq(10);
-// for( sal_Int16 i= 0; i < aseq.getLength(); i++) aseq.getArray()[i]= i;
-// rOut= aseq;
-// }
-// void SAL_CALL OComponent::out_methodSequence2(Sequence< Sequence< sal_Int32 > >& rOut) throw( RuntimeException )
-// {
-// rOut= Sequence< Sequence< sal_Int32 > >();
-// }
-// void SAL_CALL OComponent::out_methodMulParams1(sal_Int32& rout1, sal_Int32& rout2) throw( RuntimeException )
-// {
-// rout1= 111;
-// rout2= 222;
-// }
-// void SAL_CALL OComponent::out_methodMulParams2(sal_Int32& rout1, sal_Int32& rout2, OUString& rout3) throw( RuntimeException )
-// {
-// rout1= 111;
-// rout2= 222;
-// rout3= L"this is a neet little string";
-// }
-// void SAL_CALL OComponent::out_methodMulParams3(const OUString& sin, OUString& sout) throw( RuntimeException )
-// {
-// sout= L"this is a neet little string";
-// }
-
// XTestInterfaces -------------------------------------------------------------------------------------
void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallback, sal_Int32 mode ) throw(RuntimeException)
{
@@ -1469,8 +1343,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
sal_Int8 aByte;
sal_Int16 aShort;
sal_Int32 aLong;
-// sal_uInt16 aUShort;
-// sal_uInt32 aULong;
switch( mode)
{
@@ -1588,8 +1460,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
sal_Int8 aByte;
sal_Int16 aShort;
sal_Int32 aLong;
-// sal_uInt16 aUShort;
-// sal_uInt32 aULong;
xCallback->outValuesAll( xSimple, aSimpleStruct, aSimpleEnum, seqAny, aAny, aBool,
aChar, aString,
aFloat, aDouble,
@@ -1880,25 +1750,10 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
Reference<XInterface> xIntCallback= oleFact->createInstance(L"XCallback_Impl.Callback");
Reference<XInvocation> xInv( xIntCallback, UNO_QUERY);
-//Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence<Any >& aParams,Sequence< sal_Int16 >& aOutParamIndex,
-// Sequence<Any >& aOutParam );
Sequence<sal_Int16> seqIndizes;
Sequence<Any> seqOutParams;
xInv->invoke( OUString( L"outValuesAll"), Sequence<Any>(), seqIndizes, seqOutParams);
-// void outValuesAll( [out] oletest::XSimple outInterface,
-// [out] SimpleStruct outStruct ,
-// [out] SimpleEnum outEnum,
-// [out] sequence<any> outSeqAny,
-// [out] any outAny,
-// [out] boolean outBool,
-// [out] char outChar,
-// [out] string outString,
-// [out] float outFloat,
-// [out] double outDouble,
-// [out] byte outByte,
-// [out] short outShort,
-// [out] long outLong);
if( seqOutParams.getLength() == 12)
{
Reference<XSimple> xSimple= *(XSimple**)seqOutParams[0].getValue();
@@ -2026,8 +1881,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
break;
}
case 303:
- // in parameter
-// void inValues( [in] char aChar, [in] long aLong, [in] string aString);
{
Reference<XInterface> xIntFact = m_rFactory->createInstance(
L"com.sun.star.bridge.oleautomation.Factory");
@@ -2082,7 +1935,6 @@ sal_Bool SAL_CALL OComponent::isSame( const Reference< XInterface >& val ) throw
Reference< XInterface > SAL_CALL OComponent::getThis( ) throw (RuntimeException)
{
-// return Reference<XInterface>(static_cast<XIdentity*>(this), UNO_QUERY);
Reference<XInterface> ret(static_cast<XIdentity*>(this), UNO_QUERY);
return ret;
}
diff --git a/extensions/test/ole/unloading/unloadTest.cxx b/extensions/test/ole/unloading/unloadTest.cxx
index fa3e39271365..35ccd1ab1005 100644
--- a/extensions/test/ole/unloading/unloadTest.cxx
+++ b/extensions/test/ole/unloading/unloadTest.cxx
@@ -171,18 +171,6 @@ sal_Bool test3()
Reference<XComponent> xcomp( context, UNO_QUERY);
xcomp->dispose();
-// for (int i=0; i < 10; i++)
-// {
-// Reference<XSimpleRegistry> xreg= createSimpleRegistry();
-// xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")),
-// sal_False, sal_False );
-// Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
-// Reference<XComponent> xcomp( context, UNO_QUERY);
-// xcomp->dispose();
-//
-// }
-
-// return sal_True;
return bTest1 && bTest2;
}