comphelper/source/property/propstate.cxx | 2 +-
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 9 ++++++++-
dbaccess/source/core/api/query.cxx | 7 ++++++-
dbaccess/source/core/api/query.hxx | 6 ++++--
dbaccess/source/core/api/querydescriptor.cxx | 8 +++++++-
dbaccess/source/core/api/querydescriptor.hxx | 6 ++++--
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 7 ++++++-
dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 6 ++++--
dbaccess/source/core/dataaccess/commandcontainer.cxx | 8 +++++++-
dbaccess/source/core/dataaccess/commandcontainer.hxx | 6 +++++-
dbaccess/source/core/dataaccess/commanddefinition.cxx | 7 ++++++-
dbaccess/source/core/dataaccess/commanddefinition.hxx | 6 ++++--
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 9 ++++++++-
dbaccess/source/core/dataaccess/documentcontainer.cxx | 9 ++++++++-
dbaccess/source/core/dataaccess/documentcontainer.hxx | 8 ++++++--
dbaccess/source/core/dataaccess/documentdefinition.cxx | 8 +++++++-
dbaccess/source/core/dataaccess/documentdefinition.hxx | 6 ++++--
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 7 +++++--
dbaccess/source/core/inc/definitioncontainer.hxx | 7 +++++--
dbaccess/source/ui/uno/ColumnModel.cxx | 8 +++++++-
dbaccess/source/ui/uno/ColumnModel.hxx | 6 ++++--
dbaccess/source/ui/uno/composerdialogs.cxx | 6 +++++-
dbaccess/source/ui/uno/composerdialogs.hxx | 3 ++-
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 11 +++++++++--
dbaccess/source/ui/uno/unoDirectSql.cxx | 6 +++++-
dbaccess/source/ui/uno/unoDirectSql.hxx | 3 ++-
include/comphelper/propstate.hxx | 3 +--
27 files changed, 140 insertions(+), 38 deletions(-)
New commits:
commit cfedbdea58e01bb93ab30316f7cac7dc31fba3dd
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Mar 11 13:02:59 2014 +0100
Remove newly unused getUnoTunnelImplementationId functions
...after recent clean-up of getImplementationId implementations.
Change-Id: I2a11f6ddf03dc7852b7e8e50dc6284a7215a0113
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 2bfb62b..3b028ef 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -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
diff --git a/dbaccess/source/core/api/query.cxx
b/dbaccess/source/core/api/query.cxx
index 218a049..43ce3a2 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -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)
diff --git a/dbaccess/source/core/api/query.hxx
b/dbaccess/source/core/api/query.hxx
index c34c57a..9ded24f 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -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( )
diff --git a/dbaccess/source/core/api/querydescriptor.cxx
b/dbaccess/source/core/api/querydescriptor.cxx
index c9137a0..6231224 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -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()
diff --git a/dbaccess/source/core/api/querydescriptor.hxx
b/dbaccess/source/core/api/querydescriptor.hxx
index 857e919..b1d25c6 100644
--- a/dbaccess/source/core/api/querydescriptor.hxx
+++ b/dbaccess/source/core/api/querydescriptor.hxx
@@ -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( )
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 91da34b..bed8ab4 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -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)
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 2386681..d6c082f 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -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( )
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx
b/dbaccess/source/core/dataaccess/commandcontainer.cxx
index 9ddded8..f7bb22e 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
@@ -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)
{
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx
b/dbaccess/source/core/dataaccess/commandcontainer.hxx
index bf41c05..0041ab8 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx
@@ -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);
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx
b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 8adb205..ac6b1b8 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -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)
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx
b/dbaccess/source/core/dataaccess/commanddefinition.hxx
index bd7507f..25d9aae 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.hxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx
@@ -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( )
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 1261d60..f91c34e4 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -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)
{
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index fe92809..17a81eb 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -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)
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx
b/dbaccess/source/core/dataaccess/documentcontainer.hxx
index c642936..32287d7 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx
@@ -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();
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 718508e..6b045aa 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -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)
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx
b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index 4c30c2f..1fc9f58 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -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( )
diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
index 34ba303..3d67511 100644
--- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
+++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
@@ -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( )
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx
b/dbaccess/source/core/inc/definitioncontainer.hxx
index 920ed4c..79d5167 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -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);
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx
b/dbaccess/source/ui/uno/ColumnModel.cxx
index d0b7395..9247eaf 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 f0b2953..b8ab24d 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 1fcf939..6d809c6 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 fece782..4ed6502 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 0e6f9d2..5da52eb 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 5165bd9..6ae7c80 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 0d1353e..302d324 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( );
commit ff19246a810c891ab70da2006c29bbe2913c731e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Mar 11 12:48:18 2014 +0100
OPropertyStateHelper::getTypes isn't an override of XTypeProvider::getTypes
Change-Id: I633c711aabbd2ec7d1385d106b512f14672393f1
diff --git a/comphelper/source/property/propstate.cxx
b/comphelper/source/property/propstate.cxx
index 6c21c16..90d8e37 100644
--- a/comphelper/source/property/propstate.cxx
+++ b/comphelper/source/property/propstate.cxx
@@ -53,7 +53,7 @@ namespace comphelper
}
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>
OPropertyStateHelper::getTypes() throw(
::com::sun::star::uno::RuntimeException, std::exception)
+ css::uno::Sequence<css::uno::Type> OPropertyStateHelper::getTypes()
{
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>
aTypes(4);
::com::sun::star::uno::Type* pTypes = aTypes.getArray();
diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx
index 070a8b2..c62ae63 100644
--- a/include/comphelper/propstate.hxx
+++ b/include/comphelper/propstate.hxx
@@ -75,8 +75,7 @@ namespace comphelper
void firePropertyChange(sal_Int32 nHandle, const
::com::sun::star::uno::Any& aNewValue, const ::com::sun::star::uno::Any&
aOldValue);
- protected:
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>
SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException,
std::exception);
+ css::uno::Sequence<css::uno::Type> getTypes();
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
