diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:02:27 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 06:43:02 -0600 |
commit | 518b75326a83166a24b9d3c1b31ce63189f60c7f (patch) | |
tree | b0ed7c7334bf0e6bea057b4b77007c87d9754c4a /cppuhelper/test | |
parent | a67c2a12bccef06f1fb17d8fbae08e44f44c4392 (diff) |
Remove visual noise from cppuhelper
Change-Id: If23a1aa19949f91f900d55ff9e1d5039378d7277
Reviewed-on: https://gerrit.libreoffice.org/8248
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cppuhelper/test')
-rw-r--r-- | cppuhelper/test/cfg_test.cxx | 18 | ||||
-rw-r--r-- | cppuhelper/test/testimplhelper.cxx | 26 |
2 files changed, 22 insertions, 22 deletions
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index b3eec0af67d3..aaa5bed2661f 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -73,7 +73,7 @@ static OUString impl1_getImplementationName() return OUString("com.sun.star.comp.bootstrap.TestComponent1"); } -//================================================================================================== + class ServiceImpl0 : public WeakImplHelper2< lang::XServiceInfo, lang::XInitialization > { @@ -147,7 +147,7 @@ sal_Bool ServiceImpl0::supportsService( const OUString & rServiceName ) return cppu::supportsService(this, rServiceName); } -//================================================================================================== + class ServiceImpl1 : public ServiceImpl0 { public: @@ -172,14 +172,14 @@ Sequence< OUString > ServiceImpl1::getSupportedServiceNames() return impl1_getSupportedServiceNames(); } -//================================================================================================== + static Reference< XInterface > SAL_CALL ServiceImpl0_create( Reference< XComponentContext > const & xContext ) SAL_THROW( (Exception) ) { return (OWeakObject *)new ServiceImpl0( xContext ); } -//================================================================================================== + static Reference< XInterface > SAL_CALL ServiceImpl1_create( Reference< XComponentContext > const & xContext ) SAL_THROW( (Exception) ) @@ -207,14 +207,14 @@ static const struct ImplementationEntry g_entries[] = // component exports extern "C" { -//================================================================================================== + sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { return component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries ); } -//================================================================================================== + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { @@ -224,9 +224,9 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } -//################################################################################################## -//################################################################################################## -//################################################################################################## + + + SAL_IMPLEMENT_MAIN() { diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx index 37c6c3f7732b..0f359e376e72 100644 --- a/cppuhelper/test/testimplhelper.cxx +++ b/cppuhelper/test/testimplhelper.cxx @@ -77,7 +77,7 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; -//================================================================================================== + struct TestImpl : public ImplHelper4< CA, DBA, FE, G > { sal_Int32 nRef; @@ -115,7 +115,7 @@ struct TestImpl : public ImplHelper4< CA, DBA, FE, G > { return OUString("g"); } }; -//================================================================================================== + struct TestWeakAggImpl : public WeakAggImplHelper4< CA, DBA, FE, G > { virtual ~TestWeakAggImpl() @@ -144,7 +144,7 @@ struct TestWeakAggImpl : public WeakAggImplHelper4< CA, DBA, FE, G > { return OUString("g"); } }; -//================================================================================================== + struct TestWeakImpl : public WeakImplHelper4< CA, DBA, FE, G > { TestWeakImpl() {} @@ -188,7 +188,7 @@ protected: TestWeakImpl(int, int, int, int, int, int, int = 0) {} }; -//================================================================================================== + struct TestWeakComponentImpl : public WeakComponentImplHelper4< CA, DBA, FE, G > { Mutex m; @@ -224,7 +224,7 @@ struct TestWeakComponentImpl : public WeakComponentImplHelper4< CA, DBA, FE, G > { return OUString("g"); } }; -//================================================================================================== + struct TestWeakAggComponentImpl : public WeakAggComponentImplHelper4< CA, DBA, FE, G > { Mutex m; @@ -260,7 +260,7 @@ struct TestWeakAggComponentImpl : public WeakAggComponentImplHelper4< CA, DBA, F { return OUString("g"); } }; -//================================================================================================== + struct TestImplInh : public ImplInheritanceHelper2< TestWeakImpl, H, I > { TestImplInh() {} @@ -294,7 +294,7 @@ struct TestImplInh : public ImplInheritanceHelper2< TestWeakImpl, H, I > { return OUString("i"); } }; -//================================================================================================== + struct TestAggImplInh : public AggImplInheritanceHelper2< TestWeakAggImpl, H, I > { virtual ~TestAggImplInh() @@ -321,7 +321,7 @@ static bool isIn( Sequence< Type > const & rTypes, char const * name ) return false; } -//================================================================================================== + static void dotest( const Reference< XInterface > & xOriginal ) { Reference< lang::XTypeProvider > xTP( xOriginal, UNO_QUERY ); @@ -419,7 +419,7 @@ void throw_one( } -//================================================================================================== + void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) { Reference< XInterface > xImpl( (lang::XTypeProvider *)new TestImpl() ); @@ -432,7 +432,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) Reference< lang::XTypeProvider > xTP4( xWeakComponentImpl, UNO_QUERY ); Reference< XInterface > xWeakAggComponentImpl( (OWeakObject *)new TestWeakAggComponentImpl() ); Reference< lang::XTypeProvider > xTP5( xWeakAggComponentImpl, UNO_QUERY ); - // + OSL_ASSERT( xTP1->getImplementationId() != xTP2->getImplementationId() && xTP1->getImplementationId() != xTP3->getImplementationId() && @@ -444,7 +444,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) xTP3->getImplementationId() != xTP4->getImplementationId() && xTP3->getImplementationId() != xTP5->getImplementationId() && xTP4->getImplementationId() != xTP5->getImplementationId() ); - // + dotest( xImpl ); dotest( xWeakImpl ); @@ -468,7 +468,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) OSL_ASSERT( xH->h() == "h2" ); OSL_ASSERT( xI->i() == "i2" ); - // + OSL_ASSERT( xTP6->getImplementationId() != xTP1->getImplementationId() && xTP6->getImplementationId() != xTP2->getImplementationId() && @@ -481,7 +481,7 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) xTP7->getImplementationId() != xTP3->getImplementationId() && xTP7->getImplementationId() != xTP4->getImplementationId() && xTP7->getImplementationId() != xTP5->getImplementationId() ); - // + bool exc_succ = false; lang::IllegalAccessException exc( |