Skip to content

C
core
Kaydet (Commit) 096c604c authored tarafından Rüdiger Timm's avatar Rüdiger Timm
Dosyalara gözat
Seçenekler

INTEGRATION: CWS bunoidmap (1.12.12); FILE MERGED 

2006/11/08 15:11:11 kr 1.12.12.1: fixed: i71291 - stoc/test does not build
üst af8fcd7e
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 27 deletions
stoc/test/testiadapter.cxx
Dosyayı görüntüle @ 096c604c
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: testiadapter.cxx,v $ * $RCSfile: testiadapter.cxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: obo $ $Date: 2006-09-16 17:40:34 $ * last change: $Author: rt $ $Date: 2006-12-01 17:22:21 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -302,7 +302,7 @@ class XLB_Invocation : public WeakImplHelper1< XInvocation > ...@@ -302,7 +302,7 @@ class XLB_Invocation : public WeakImplHelper1< XInvocation >
Reference< XLanguageBindingTest > _xLBT; Reference< XLanguageBindingTest > _xLBT;
public: public:
XLB_Invocation( const Reference< XMultiServiceFactory > & xMgr, XLB_Invocation( const Reference< XMultiServiceFactory > & /*xMgr*/,
const Reference< XLanguageBindingTest > & xLBT ) const Reference< XLanguageBindingTest > & xLBT )
: _xLBT( xLBT ) : _xLBT( xLBT )
{} {}
...@@ -869,7 +869,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT ) ...@@ -869,7 +869,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
} }
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
test::TestData Test_Impl::raiseException( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, test::TestEnum& eEnum, ::rtl::OUString& aString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInterface, ::com::sun::star::uno::Any& aAny, ::com::sun::star::uno::Sequence< test::TestElement >& aSequence, test::TestData& aStruct ) test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cChar*/, sal_Int8& /*nByte*/, sal_Int16& /*nShort*/, sal_uInt16& /*nUShort*/, sal_Int32& /*nLong*/, sal_uInt32& /*nULong*/, sal_Int64& /*nHyper*/, sal_uInt64& /*nUHyper*/, float& /*fFloat*/, double& /*fDouble*/, test::TestEnum& /*eEnum*/, ::rtl::OUString& /*aString*/, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& /*xInterface*/, ::com::sun::star::uno::Any& /*aAny*/, ::com::sun::star::uno::Sequence< test::TestElement >& /*aSequence*/, test::TestData& /*aStruct*/ )
throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{ {
IllegalArgumentException aExc; IllegalArgumentException aExc;
...@@ -877,7 +877,6 @@ test::TestData Test_Impl::raiseException( sal_Bool& bBool, sal_Unicode& cChar, s ...@@ -877,7 +877,6 @@ test::TestData Test_Impl::raiseException( sal_Bool& bBool, sal_Unicode& cChar, s
aExc.Message = OUString::createFromAscii("dum dum dum ich tanz im kreis herum..."); aExc.Message = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
aExc.Context = *this; aExc.Context = *this;
throw aExc; throw aExc;
return test::TestData();
} }
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeException) sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeException)
...@@ -886,10 +885,9 @@ sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeE ...@@ -886,10 +885,9 @@ sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeE
aExc.Message = OUString::createFromAscii("dum dum dum ich tanz im kreis herum..."); aExc.Message = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
aExc.Context = *this; aExc.Context = *this;
throw aExc; throw aExc;
return 0;
} }
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
void Test_Impl::setRuntimeException( sal_Int32 _runtimeexception ) throw(::com::sun::star::uno::RuntimeException) void Test_Impl::setRuntimeException( sal_Int32 /*_runtimeexception*/ ) throw(::com::sun::star::uno::RuntimeException)
{ {
RuntimeException aExc; RuntimeException aExc;
aExc.Message = OUString::createFromAscii("dum dum dum ich tanz im kreis herum..."); aExc.Message = OUString::createFromAscii("dum dum dum ich tanz im kreis herum...");
...@@ -920,12 +918,12 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT ) ...@@ -920,12 +918,12 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
aExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")), aExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")),
"### unexpected exception content!" ); "### unexpected exception content!" );
Reference<XLanguageBindingTest > xLBT( Reference<XLanguageBindingTest > xLBT2(
Reference<XLanguageBindingTest >::query( aExc.Context ) ); Reference<XLanguageBindingTest >::query( aExc.Context ) );
OSL_ENSURE( xLBT.is(), "### unexpected source of exception!" ); OSL_ENSURE( xLBT2.is(), "### unexpected source of exception!" );
if (xLBT.is()) if (xLBT2.is())
xLBT->getRuntimeException(); xLBT2->getRuntimeException();
else else
return sal_False; return sal_False;
} }
...@@ -936,12 +934,12 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT ) ...@@ -936,12 +934,12 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
rExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")), rExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")),
"### unexpected exception content!" ); "### unexpected exception content!" );
Reference<XLanguageBindingTest > xLBT( Reference<XLanguageBindingTest > xLBT2(
Reference<XLanguageBindingTest >::query( rExc.Context ) ); Reference<XLanguageBindingTest >::query( rExc.Context ) );
OSL_ENSURE( xLBT.is(), "### unexpected source of exception!" ); OSL_ENSURE( xLBT2.is(), "### unexpected source of exception!" );
if (xLBT.is()) if (xLBT2.is())
xLBT->setRuntimeException( 0xcafebabe ); xLBT2->setRuntimeException( 0xcafebabe );
else else
return sal_False; return sal_False;
} }
...@@ -1026,7 +1024,6 @@ SAL_IMPLEMENT_MAIN() ...@@ -1026,7 +1024,6 @@ SAL_IMPLEMENT_MAIN()
Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory(
OUString( RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb") ) ) ); OUString( RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb") ) ) );
sal_Bool bSucc = sal_False;
try try
{ {
Reference< XImplementationRegistration > xImplReg( Reference< XImplementationRegistration > xImplReg(
......
stoc/test/testloader.cxx
Dosyayı görüntüle @ 096c604c
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: testloader.cxx,v $ * $RCSfile: testloader.cxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: obo $ $Date: 2006-09-16 17:41:00 $ * last change: $Author: rt $ $Date: 2006-12-01 17:22:48 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -78,7 +78,7 @@ using namespace cppu; ...@@ -78,7 +78,7 @@ using namespace cppu;
class EmptyComponentContext : public WeakImplHelper1< XComponentContext > class EmptyComponentContext : public WeakImplHelper1< XComponentContext >
{ {
public: public:
virtual Any SAL_CALL getValueByName( const OUString& Name ) virtual Any SAL_CALL getValueByName( const OUString& /*Name*/ )
throw (RuntimeException) throw (RuntimeException)
{ {
return Any(); return Any();
...@@ -105,7 +105,7 @@ SAL_IMPLEMENT_MAIN() ...@@ -105,7 +105,7 @@ SAL_IMPLEMENT_MAIN()
{ {
// try to get provider from module // try to get provider from module
component_getFactoryFunc pCompFactoryFunc = (component_getFactoryFunc) component_getFactoryFunc pCompFactoryFunc = (component_getFactoryFunc)
module.getSymbol( OUString::createFromAscii(COMPONENT_GETFACTORY) ); module.getFunctionSymbol( OUString::createFromAscii(COMPONENT_GETFACTORY) );
if (pCompFactoryFunc) if (pCompFactoryFunc)
{ {
......
stoc/test/testproxyfac.cxx
Dosyayı görüntüle @ 096c604c
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: testproxyfac.cxx,v $ * $RCSfile: testproxyfac.cxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: obo $ $Date: 2006-09-16 17:41:21 $ * last change: $Author: rt $ $Date: 2006-12-01 17:23:00 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -85,7 +85,7 @@ public: ...@@ -85,7 +85,7 @@ public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (RuntimeException) virtual OUString SAL_CALL getImplementationName() throw (RuntimeException)
{ return OUString::createFromAscii( "target" ); } { return OUString::createFromAscii( "target" ); }
virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) virtual sal_Bool SAL_CALL supportsService( const OUString & /*rServiceName*/ )
throw (RuntimeException) throw (RuntimeException)
{ return sal_False; } { return sal_False; }
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
...@@ -149,7 +149,7 @@ public: ...@@ -149,7 +149,7 @@ public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (RuntimeException) virtual OUString SAL_CALL getImplementationName() throw (RuntimeException)
{ return OUString::createFromAscii( "master" ); } { return OUString::createFromAscii( "master" ); }
virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) virtual sal_Bool SAL_CALL supportsService( const OUString & /*rServiceName*/ )
throw (RuntimeException) throw (RuntimeException)
{ return sal_False; } { return sal_False; }
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
...@@ -186,8 +186,8 @@ Reference< XInterface > TestMaster::create( ...@@ -186,8 +186,8 @@ Reference< XInterface > TestMaster::create(
static void test_proxyfac_( static void test_proxyfac_(
Reference< XInterface > const & xMaster, OUString const & test, Reference< XInterface > const & xMaster, OUString const & /*test*/,
Reference< reflection::XProxyFactory > const & xProxyFac ) Reference< reflection::XProxyFactory > const & /*xProxyFac*/ )
{ {
Reference< lang::XServiceInfo > xMaster_XServiceInfo( Reference< lang::XServiceInfo > xMaster_XServiceInfo(
xMaster, UNO_QUERY_THROW ); xMaster, UNO_QUERY_THROW );
...@@ -336,7 +336,7 @@ SAL_IMPLEMENT_MAIN() ...@@ -336,7 +336,7 @@ SAL_IMPLEMENT_MAIN()
xProxyFac ); xProxyFac );
uno_dumpEnvironment( stdout, cpp_env.get(), 0 ); uno_dumpEnvironment( stdout, cpp_env.get(), 0 );
} }
catch (Exception & rExc) catch (Exception & /*rExc*/)
{ {
OSL_ENSURE( OSL_ENSURE(
! __FILE__, ! __FILE__,
......
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