diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-11 13:02:59 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-11 13:03:20 +0100 |
commit | cfedbdea58e01bb93ab30316f7cac7dc31fba3dd (patch) | |
tree | 474c5a2be1df317c2aaf652532604d1763456f5b /dbaccess/source/ui/uno | |
parent | ff19246a810c891ab70da2006c29bbe2913c731e (diff) |
Remove newly unused getUnoTunnelImplementationId functions
...after recent clean-up of getImplementationId implementations.
Change-Id: I2a11f6ddf03dc7852b7e8e50dc6284a7215a0113
Diffstat (limited to 'dbaccess/source/ui/uno')
-rw-r--r-- | dbaccess/source/ui/uno/ColumnModel.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/ColumnModel.hxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/composerdialogs.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/composerdialogs.hxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 11 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/unoDirectSql.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/unoDirectSql.hxx | 3 |
7 files changed, 34 insertions, 9 deletions
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index d0b739535b0b..9247eafacb6a 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -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 ) diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index f0b295340fcd..b8ab24d56b69 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -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); diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 1fcf93916aa1..6d809c6e4d18 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -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 ) diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index fece7823b49e..4ed650242ce2 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -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( ); diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 0e6f9d2b36c3..5da52eb020cf 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -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) diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 5165bd98220e..6ae7c806845e 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -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) diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 0d1353e45cf8..302d324b8367 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -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( ); |