diff options
| -rw-r--r-- | cppuhelper/Library_cppuhelper.mk | 1 | ||||
| -rw-r--r-- | cppuhelper/Package_inc.mk | 1 | ||||
| -rw-r--r-- | cppuhelper/inc/cppuhelper/stdidlclass.hxx | 280 | ||||
| -rw-r--r-- | cppuhelper/source/stdidlclass.cxx | 54 | ||||
| -rw-r--r-- | cppuhelper/test/testidlclass.cxx | 204 |
5 files changed, 0 insertions, 540 deletions
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 9a761276e46b..a9fb3833e040 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -69,7 +69,6 @@ $(eval $(call gb_Library_add_exception_objects,cppuhelper,\ cppuhelper/source/propshlp \ cppuhelper/source/servicefactory \ cppuhelper/source/shlib \ - cppuhelper/source/stdidlclass \ cppuhelper/source/supportsservice \ cppuhelper/source/tdmgr \ cppuhelper/source/typeprovider \ diff --git a/cppuhelper/Package_inc.mk b/cppuhelper/Package_inc.mk index d164f3833e0f..fb0688740214 100644 --- a/cppuhelper/Package_inc.mk +++ b/cppuhelper/Package_inc.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/proptypehlp.hxx, $(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/queryinterface.hxx,cppuhelper/queryinterface.hxx)) $(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/servicefactory.hxx,cppuhelper/servicefactory.hxx)) $(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/shlib.hxx,cppuhelper/shlib.hxx)) -$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/stdidlclass.hxx,cppuhelper/stdidlclass.hxx)) $(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/supportsservice.hxx,cppuhelper/supportsservice.hxx)) $(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/typeprovider.hxx,cppuhelper/typeprovider.hxx)) $(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/unourl.hxx,cppuhelper/unourl.hxx)) diff --git a/cppuhelper/inc/cppuhelper/stdidlclass.hxx b/cppuhelper/inc/cppuhelper/stdidlclass.hxx deleted file mode 100644 index 750057fef12e..000000000000 --- a/cppuhelper/inc/cppuhelper/stdidlclass.hxx +++ /dev/null @@ -1,280 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _CPPUHELPER_STDIDLCLASS_HXX_ -#define _CPPUHELPER_STDIDLCLASS_HXX_ - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/reflection/XIdlClass.hpp> -#include "cppuhelperdllapi.h" - - -namespace cppu { - -/* - @deprecated - always returns </NULL> -*/ -CPPUHELPER_DLLPUBLIC ::com::sun::star::reflection::XIdlClass * SAL_CALL createStandardClassWithSequence( - const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr , - const ::rtl::OUString & sImplementationName , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & rSuperClass, - const ::com::sun::star::uno::Sequence < ::rtl::OUString > &seq ) - SAL_THROW(()); - - - -/** - Standard function to create an XIdlClass for a component. - There is a function for each number of supported interfaces up to 10. - - Since the switch to the final component model, there are no use cases anymore where - these functions should be used. Instead use the implementation helpers directly - (see cppuhelper/implbase1.hxx). - - @see OTypeCollection - - @deprecated - always returns </NULL> - */ -template < class Interface1 > -inline ::com::sun::star::reflection::XIdlClass * SAL_CALL -//inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &, - const ::rtl::OUString & , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , - const Interface1 * - ) - SAL_THROW(()) -{ - return 0; -} - - - -template < class Interface1, class Interface2 > -inline ::com::sun::star::reflection::XIdlClass * SAL_CALL -//inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &, - const ::rtl::OUString & , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , - const Interface1 *, - const Interface2 * - ) - SAL_THROW(()) -{ - return 0; -} - - - - - -template < class Interface1, class Interface2 , class Interface3 > -inline ::com::sun::star::reflection::XIdlClass * SAL_CALL -//inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &, - const ::rtl::OUString & , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , - const Interface1 *, - const Interface2 *, - const Interface3 * - ) - SAL_THROW(()) -{ - return 0; -} - - - - - -template < class Interface1, class Interface2 , class Interface3 , class Interface4 > -inline ::com::sun::star::reflection::XIdlClass * SAL_CALL -//inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &, - const ::rtl::OUString & , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , - const Interface1 *, - const Interface2 *, - const Interface3 *, - const Interface4 * - ) - SAL_THROW(()) -{ - return 0; -} - - - - - - - -template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 > -inline ::com::sun::star::reflection::XIdlClass * SAL_CALL -//inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &, - const ::rtl::OUString & , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , - const Interface1 *, - const Interface2 *, - const Interface3 *, - const Interface4 *, - const Interface5 * - ) - SAL_THROW(()) -{ - return 0; -} - - - - -template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 , - class Interface6 > -inline ::com::sun::star::reflection::XIdlClass * SAL_CALL -//inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &, - const ::rtl::OUString & , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , - const Interface1 *, - const Interface2 *, - const Interface3 *, - const Interface4 *, - const Interface5 *, - const Interface6 * - ) - SAL_THROW(()) -{ - return 0; -} - - - - - -template < class Interface1, class Interface2 , class Interface3 , class Interface4 , class Interface5 , - class Interface6, class Interface7 > -inline ::com::sun::star::reflection::XIdlClass * SAL_CALL -//inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &, - const ::rtl::OUString & , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , - const Interface1 *, - const Interface2 *, - const Interface3 *, - const Interface4 *, - const Interface5 *, - const Interface6 *, - const Interface7 * - ) - SAL_THROW(()) -{ - return 0; -} - - - - - - -template < class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 , - class Interface6, class Interface7, class Interface8 > -inline ::com::sun::star::reflection::XIdlClass * SAL_CALL -//inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &, - const ::rtl::OUString & , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , - const Interface1 *, - const Interface2 *, - const Interface3 *, - const Interface4 *, - const Interface5 *, - const Interface6 *, - const Interface7 *, - const Interface8 * - ) - SAL_THROW(()) -{ - return 0; -} - - - - -template < class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 , - class Interface6, class Interface7, class Interface8 , class Interface9 > -inline ::com::sun::star::reflection::XIdlClass * SAL_CALL -//inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &, - const ::rtl::OUString & , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , - const Interface1 *, - const Interface2 *, - const Interface3 *, - const Interface4 *, - const Interface5 *, - const Interface6 *, - const Interface7 *, - const Interface8 *, - const Interface9 * - ) - SAL_THROW(()) -{ - return 0; -} - - -template < class Interface1, class Interface2, class Interface3 , class Interface4 , class Interface5 , - class Interface6, class Interface7, class Interface8 , class Interface9 , class Interface10 > -inline ::com::sun::star::reflection::XIdlClass * SAL_CALL -//inline ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > -createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &, - const ::rtl::OUString & , - const ::com::sun::star::uno::Reference < ::com::sun::star::reflection::XIdlClass > & , - const Interface1 *, - const Interface2 *, - const Interface3 *, - const Interface4 *, - const Interface5 *, - const Interface6 *, - const Interface7 *, - const Interface8 *, - const Interface9 *, - const Interface10 * - ) - SAL_THROW(()) -{ - return 0; -} - -} // end namespace cppu - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/stdidlclass.cxx b/cppuhelper/source/stdidlclass.cxx deleted file mode 100644 index e42d83bebe97..000000000000 --- a/cppuhelper/source/stdidlclass.cxx +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "sal/config.h" - -#include "cppuhelper/stdidlclass.hxx" -#include "sal/log.hxx" -#include "sal/types.h" - -namespace cppu { - -com::sun::star::reflection::XIdlClass * createStandardClassWithSequence( - SAL_UNUSED_PARAMETER com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > const &, - SAL_UNUSED_PARAMETER rtl::OUString const &, - SAL_UNUSED_PARAMETER com::sun::star::uno::Reference< - com::sun::star::reflection::XIdlClass > const &, - SAL_UNUSED_PARAMETER com::sun::star::uno::Sequence< rtl::OUString > const &) - SAL_THROW(()) -{ - SAL_INFO( - "cppuhelper", - "deprecated/defunct cppu::createStandardClassWithSequence called"); - return 0; -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testidlclass.cxx b/cppuhelper/test/testidlclass.cxx deleted file mode 100644 index 590d3143c9df..000000000000 --- a/cppuhelper/test/testidlclass.cxx +++ /dev/null @@ -1,204 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include <cppuhelper/stdidlclass.hxx> - -#include <com/sun/star/lang/XServiceInfo.hpp> - -#include "testhelper.hxx" - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::reflection; -using namespace ::rtl; - - - - -void testidlclass( const Reference < XMultiServiceFactory > &rSMgr) -{ - const OUString sImplName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.cpputest") ) ); - - // this reference is static to test behaviour during exiting application - Reference < XIdlClass > r = - ::cppu::createStandardClass( - rSMgr , - sImplName, - Reference < XIdlClass > () , - (XMultiServiceFactory * ) 0 , - (XServiceInfo * ) 0 - ); - - OSL_ASSERT( r.is() ); - OSL_ASSERT( r->getName() == sImplName ); - - // test equals - Reference < XIdlClass > r2 = - ::cppu::createStandardClass( - rSMgr , - sImplName, - Reference < XIdlClass > () , - (XMultiServiceFactory * ) 0 , - (XServiceInfo * ) 0 - ); - // test for implementation name - OSL_ASSERT( r2->equals( r ) ); - - Sequence < Reference < XIdlClass > > seqIdlClass = r->getInterfaces(); - - //TODO ! - // one idl class for one interface - // this test fails, if core reflection fails ! -// OSL_ASSERT( 1 == seqIdlClass.getLength() ); -// Reference < XIdlClass > rIdlInterface = seqIdlClass.getArray()[0]; - - // check for IdlClass interface returned by Core Reflection -// OSL_ASSERT( rIdlInterface.is() ); - - - - // Test all ten templates - Reference< XIdlClass > x = ::cppu::createStandardClass( - rSMgr , - sImplName, - Reference < XIdlClass > () , - (XMultiServiceFactory * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 - ); - - // Test all ten templates - x = ::cppu::createStandardClass( - rSMgr , - sImplName, - Reference < XIdlClass > () , - (XMultiServiceFactory * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 - ); - - - // Test all ten templates - x = ::cppu::createStandardClass( - rSMgr , - sImplName, - Reference < XIdlClass > () , - (XMultiServiceFactory * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 - ); - - - - // Test all ten templates - x = ::cppu::createStandardClass( - rSMgr , - sImplName, - Reference < XIdlClass > () , - (XMultiServiceFactory * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 - ); - - - - // Test all ten templates - x = ::cppu::createStandardClass( - rSMgr , - sImplName, - Reference < XIdlClass > () , - (XMultiServiceFactory * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 - ); - - - // Test all ten templates - x = ::cppu::createStandardClass( - rSMgr , - sImplName, - Reference < XIdlClass > () , - (XMultiServiceFactory * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 - ); - - - - - // Test all ten templates - x = ::cppu::createStandardClass( - rSMgr , - sImplName, - Reference < XIdlClass > () , - (XMultiServiceFactory * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 - ); - - // Test all ten templates - x = ::cppu::createStandardClass( - rSMgr , - sImplName, - Reference < XIdlClass > () , - (XMultiServiceFactory * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 , - (XServiceInfo * ) 0 - ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |