mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove newly unused getUnoTunnelImplementationId functions

Browse Source 
...after recent clean-up of getImplementationId implementations.

Change-Id: I2a11f6ddf03dc7852b7e8e50dc6284a7215a0113
This commit is contained in:
Stephan Bergmann 2014-03-11 13:02:59 +01:00
parent ff19246a81
commit cfedbdea58
25 changed files with 138 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbaccess/source/core/api/SingleSelectQueryComposer.cxx
View File

@ -297,7 +297,14 @@ void SAL_CALL OSingleSelectQueryComposer::disposing(void)
IMPLEMENT_FORWARD_XINTERFACE3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
IMPLEMENT_SERVICE_INFO1(OSingleSelectQueryComposer,"org.openoffice.comp.dba.OSingleSelectQueryComposer",SERVICE_NAME_SINGLESELECTQUERYCOMPOSER)
IMPLEMENT_TYPEPROVIDER3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
css::uno::Sequence<sal_Int8> OSingleSelectQueryComposer::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_GETTYPES3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer)
// XSingleSelectQueryAnalyzer

7
dbaccess/source/core/api/query.cxx
View File

@ -108,7 +108,12 @@ OQuery::~OQuery()
{
}
IMPLEMENT_IMPLEMENTATION_ID(OQuery);
css::uno::Sequence<sal_Int8> OQuery::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_GETTYPES3(OQuery,OQueryDescriptor_Base,ODataSettings,OContentHelper);
IMPLEMENT_FORWARD_XINTERFACE3( OQuery,OContentHelper,OQueryDescriptor_Base,ODataSettings)

6
dbaccess/source/core/api/query.hxx
View File

@ -97,8 +97,10 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB
);
// com::sun::star::lang::XTypeProvider
DECLARE_TYPEPROVIDER( );
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::uno::XInterface
DECLARE_XINTERFACE( )

8
dbaccess/source/core/api/querydescriptor.cxx
View File

@ -65,7 +65,13 @@ OQueryDescriptor::~OQueryDescriptor()
{
}
IMPLEMENT_TYPEPROVIDER2(OQueryDescriptor,OQueryDescriptor_Base,ODataSettings);
css::uno::Sequence<sal_Int8> OQueryDescriptor::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_GETTYPES2(OQueryDescriptor,OQueryDescriptor_Base,ODataSettings);
IMPLEMENT_FORWARD_XINTERFACE3( OQueryDescriptor,OWeakObject,OQueryDescriptor_Base,ODataSettings)
void OQueryDescriptor::registerProperties()

6
dbaccess/source/core/api/querydescriptor.hxx
View File

@ -128,8 +128,10 @@ public:
OQueryDescriptor();
OQueryDescriptor(const OQueryDescriptor_Base& _rSource);
// com::sun::star::lang::XTypeProvider
DECLARE_TYPEPROVIDER( );
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::uno::XInterface
DECLARE_XINTERFACE( )

7
dbaccess/source/core/dataaccess/ComponentDefinition.cxx
View File

@ -150,7 +150,12 @@ OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxCo
OSL_ENSURE(!m_pImpl->m_aProps.aTitle.isEmpty(), "OComponentDefinition::OComponentDefinition : invalid name !");
}
IMPLEMENT_IMPLEMENTATION_ID(OComponentDefinition);
css::uno::Sequence<sal_Int8> OComponentDefinition::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_GETTYPES3(OComponentDefinition,ODataSettings,OContentHelper,OComponentDefinition_BASE);
IMPLEMENT_FORWARD_XINTERFACE3( OComponentDefinition,OContentHelper,ODataSettings,OComponentDefinition_BASE)

6
dbaccess/source/core/dataaccess/ComponentDefinition.hxx
View File

@ -115,8 +115,10 @@ public:
,sal_Bool _bTable = sal_True
);
// com::sun::star::lang::XTypeProvider
DECLARE_TYPEPROVIDER( );
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::uno::XInterface
DECLARE_XINTERFACE( )

8
dbaccess/source/core/dataaccess/commandcontainer.cxx
View File

@ -54,7 +54,13 @@ OCommandContainer::~OCommandContainer()
}
IMPLEMENT_FORWARD_XINTERFACE2( OCommandContainer,ODefinitionContainer,OCommandContainer_BASE)
IMPLEMENT_TYPEPROVIDER2(OCommandContainer,ODefinitionContainer,OCommandContainer_BASE);
IMPLEMENT_GETTYPES2(OCommandContainer,ODefinitionContainer,OCommandContainer_BASE);
css::uno::Sequence<sal_Int8> OCommandContainer::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
Reference< XContent > OCommandContainer::createObject( const OUString& _rName)
{

6
dbaccess/source/core/dataaccess/commandcontainer.hxx
View File

@ -49,7 +49,11 @@ public:
);
DECLARE_XINTERFACE( )
DECLARE_TYPEPROVIDER( );
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSingleServiceFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);

7
dbaccess/source/core/dataaccess/commanddefinition.cxx
View File

@ -144,7 +144,12 @@ OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContai
registerProperties();
}
IMPLEMENT_IMPLEMENTATION_ID(OCommandDefinition);
css::uno::Sequence<sal_Int8> OCommandDefinition::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_GETTYPES2(OCommandDefinition,OCommandDefinition_Base,OComponentDefinition);
IMPLEMENT_FORWARD_XINTERFACE2( OCommandDefinition,OComponentDefinition,OCommandDefinition_Base)
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2(OCommandDefinition,OCommandDefinition_PROP)

6
dbaccess/source/core/dataaccess/commanddefinition.hxx
View File

@ -75,8 +75,10 @@ public:
,const TContentPtr& _pImpl
);
// com::sun::star::lang::XTypeProvider
DECLARE_TYPEPROVIDER( );
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::uno::XInterface
DECLARE_XINTERFACE( )

9
dbaccess/source/core/dataaccess/definitioncontainer.cxx
View File

@ -148,7 +148,14 @@ ODefinitionContainer::~ODefinitionContainer()
}
IMPLEMENT_FORWARD_XINTERFACE2( ODefinitionContainer,OContentHelper,ODefinitionContainer_Base)
IMPLEMENT_TYPEPROVIDER2(ODefinitionContainer,OContentHelper,ODefinitionContainer_Base);
IMPLEMENT_GETTYPES2(ODefinitionContainer,OContentHelper,ODefinitionContainer_Base);
css::uno::Sequence<sal_Int8> ODefinitionContainer::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
// XServiceInfo
OUString SAL_CALL ODefinitionContainer::getImplementationName( ) throw(RuntimeException, std::exception)
{

9
dbaccess/source/core/dataaccess/documentcontainer.cxx
View File

@ -114,7 +114,14 @@ ODocumentContainer::~ODocumentContainer()
}
IMPLEMENT_FORWARD_XINTERFACE3( ODocumentContainer,ODefinitionContainer,ODocumentContainer_Base,OPropertyStateContainer)
IMPLEMENT_TYPEPROVIDER3(ODocumentContainer,ODefinitionContainer,OPropertyStateContainer,ODocumentContainer_Base);
css::uno::Sequence<sal_Int8> ODocumentContainer::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_GETTYPES3(ODocumentContainer,ODefinitionContainer,OPropertyStateContainer,ODocumentContainer_Base);
IMPLEMENT_SERVICE_INFO_IMPLNAME(ODocumentContainer, "com.sun.star.comp.dba.ODocumentContainer");
IMPLEMENT_SERVICE_INFO_SUPPORTS(ODocumentContainer);
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(ODocumentContainer)

8
dbaccess/source/core/dataaccess/documentcontainer.hxx
View File

@ -59,8 +59,12 @@ public:
// ::com::sun::star::uno::XInterface
DECLARE_XINTERFACE( )
// com::sun::star::lang::XTypeProvider
DECLARE_TYPEPROVIDER( );
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
DECLARE_SERVICE_INFO();

8
dbaccess/source/core/dataaccess/documentdefinition.cxx
View File

@ -490,7 +490,13 @@ void SAL_CALL ODocumentDefinition::disposing()
}
}
IMPLEMENT_TYPEPROVIDER3(ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base);
css::uno::Sequence<sal_Int8> ODocumentDefinition::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_GETTYPES3(ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base);
IMPLEMENT_FORWARD_XINTERFACE3( ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base)
IMPLEMENT_SERVICE_INFO1(ODocumentDefinition,"com.sun.star.comp.dba.ODocumentDefinition",SERVICE_SDB_DOCUMENTDEFINITION)

6
dbaccess/source/core/dataaccess/documentdefinition.hxx
View File

@ -89,8 +89,10 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& i_rConnection
);
// com::sun::star::lang::XTypeProvider
DECLARE_TYPEPROVIDER( );
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::uno::XInterface
DECLARE_XINTERFACE( )

7
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
View File

@ -208,8 +208,11 @@ namespace dbaccess
void SAL_CALL disposing(void);
// ::com::sun::star::lang::XTypeProvider
DECLARE_TYPEPROVIDER( );
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::uno::XInterface
DECLARE_XINTERFACE( )

7
dbaccess/source/core/inc/definitioncontainer.hxx
View File

@ -163,8 +163,11 @@ public:
// ::com::sun::star::uno::XInterface
DECLARE_XINTERFACE( )
// com::sun::star::lang::XTypeProvider
DECLARE_TYPEPROVIDER( );
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception);

8
dbaccess/source/ui/uno/ColumnModel.cxx
View File

@ -106,7 +106,13 @@ Reference< XCloneable > SAL_CALL OColumnControlModel::createClone( ) throw (Runt
return new OColumnControlModel( this, getORB() );
}
IMPLEMENT_TYPEPROVIDER2(OColumnControlModel,OColumnControlModel_BASE,comphelper::OPropertyContainer)
css::uno::Sequence<sal_Int8> OColumnControlModel::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_GETTYPES2(OColumnControlModel,OColumnControlModel_BASE,comphelper::OPropertyContainer)
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OColumnControlModel)
IMPLEMENT_SERVICE_INFO2_STATIC(OColumnControlModel,"com.sun.star.comp.dbu.OColumnControlModel","com.sun.star.awt.UnoControlModel","com.sun.star.sdb.ColumnDescriptorControlModel")
IMPLEMENT_FORWARD_REFCOUNT( OColumnControlModel, OColumnControlModel_BASE )

6
dbaccess/source/ui/uno/ColumnModel.hxx
View File

@ -76,8 +76,10 @@ public:
// ::com::sun::star::lang::XServiceInfo
DECLARE_SERVICE_INFO_STATIC();
// XTypeProvider
DECLARE_TYPEPROVIDER( );
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// com::sun::star::uno::XAggregation
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception);

6
dbaccess/source/ui/uno/composerdialogs.cxx
View File

@ -68,7 +68,11 @@ namespace dbaui
}
IMPLEMENT_IMPLEMENTATION_ID( ComposerDialog )
css::uno::Sequence<sal_Int8> ComposerDialog::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ComposerDialog )

3
dbaccess/source/ui/uno/composerdialogs.hxx
View File

@ -55,7 +55,8 @@ namespace dbaui
~ComposerDialog();
public:
DECLARE_IMPLEMENTATION_ID( );
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
DECLARE_PROPERTYCONTAINER_DEFAULTS( );

11
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
View File

@ -73,7 +73,9 @@ namespace dbaui
virtual ~OTextConnectionSettingsDialog();
public:
DECLARE_IMPLEMENTATION_ID( );
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
DECLARE_SERVICE_INFO_STATIC( );
DECLARE_PROPERTYCONTAINER_DEFAULTS( );
@ -118,7 +120,12 @@ namespace dbaui
{
}
IMPLEMENT_IMPLEMENTATION_ID( OTextConnectionSettingsDialog )
css::uno::Sequence<sal_Int8>
OTextConnectionSettingsDialog::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OTextConnectionSettingsDialog, "com.sun.star.comp.dbaccess.OTextConnectionSettingsDialog")
IMPLEMENT_SERVICE_INFO_SUPPORTS(OTextConnectionSettingsDialog)

6
dbaccess/source/ui/uno/unoDirectSql.cxx
View File

@ -57,7 +57,11 @@ namespace dbaui
}
IMPLEMENT_IMPLEMENTATION_ID( ODirectSQLDialog )
css::uno::Sequence<sal_Int8> ODirectSQLDialog::getImplementationId()
throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(ODirectSQLDialog, "com.sun.star.comp.sdb.DirectSQLDialog")
IMPLEMENT_SERVICE_INFO_SUPPORTS(ODirectSQLDialog)

3
dbaccess/source/ui/uno/unoDirectSql.hxx
View File

@ -48,7 +48,8 @@ namespace dbaui
virtual ~ODirectSQLDialog();
public:
DECLARE_IMPLEMENTATION_ID( );
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
DECLARE_SERVICE_INFO_STATIC( );