summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-02-03 13:09:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-02-03 13:40:39 +0100
commit9f5eb314b0fc74d3779a8ce8116aa219ab82d5aa (patch)
treeb8ee160f1b86df87b94eeccde38ef28cd7c29891 /dbaccess
parent5dd4c96874db50be7af2a6f3514091c240d0967c (diff)
loplugin:unusedfields
tweak plugin with the name of another clone method Change-Id: I47193d31f53f48297c9e773da375c7255ddde282 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87852 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.cxx17
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.hxx6
2 files changed, 13 insertions, 10 deletions
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx
index 63799e50dabf..b0c7b854263b 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -43,10 +43,9 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
-OColumnControlModel::OColumnControlModel(const Reference<XMultiServiceFactory>& _rxFactory)
+OColumnControlModel::OColumnControlModel()
:OPropertyContainer(m_aBHelper)
,OColumnControlModel_BASE(m_aMutex)
- ,m_xORB(_rxFactory)
,m_sDefaultControl(SERVICE_CONTROLDEFAULT)
,m_bEnable(true)
,m_nBorder(0)
@@ -55,10 +54,9 @@ OColumnControlModel::OColumnControlModel(const Reference<XMultiServiceFactory>&
registerProperties();
}
-OColumnControlModel::OColumnControlModel(const OColumnControlModel* _pSource,const Reference<XMultiServiceFactory>& _rxFactory)
+OColumnControlModel::OColumnControlModel(const OColumnControlModel* _pSource)
:OPropertyContainer(m_aBHelper)
,OColumnControlModel_BASE(m_aMutex)
- ,m_xORB(_rxFactory)
,m_sDefaultControl(_pSource->m_sDefaultControl)
,m_aTabStop(_pSource->m_aTabStop)
,m_bEnable(_pSource->m_bEnable)
@@ -101,7 +99,7 @@ void OColumnControlModel::registerProperties()
// XCloneable
Reference< XCloneable > SAL_CALL OColumnControlModel::createClone( )
{
- return new OColumnControlModel( this, m_xORB );
+ return new OColumnControlModel( this );
}
css::uno::Sequence<sal_Int8> OColumnControlModel::getImplementationId()
@@ -111,7 +109,14 @@ css::uno::Sequence<sal_Int8> OColumnControlModel::getImplementationId()
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_SERVICE_INFO_IMPLNAME_STATIC(OColumnControlModel, "com.sun.star.comp.dbu.OColumnControlModel")
+IMPLEMENT_SERVICE_INFO_SUPPORTS(OColumnControlModel)
+IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(OColumnControlModel, "com.sun.star.awt.UnoControlModel","com.sun.star.sdb.ColumnDescriptorControlModel")
+css::uno::Reference< css::uno::XInterface >
+ OColumnControlModel::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& )
+{
+ return static_cast< XServiceInfo* >(new OColumnControlModel());
+}
IMPLEMENT_FORWARD_REFCOUNT( OColumnControlModel, OColumnControlModel_BASE )
Any SAL_CALL OColumnControlModel::queryInterface( const Type& _rType )
{
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx
index 705f9166376d..f3bbb7aec199 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.hxx
@@ -49,7 +49,6 @@ class OColumnControlModel : public ::comphelper::OMutexAndBroadcastHelper
,public OColumnControlModel_BASE
{
- css::uno::Reference< css::lang::XMultiServiceFactory> m_xORB;
// [properties]
css::uno::Reference< css::sdbc::XConnection> m_xConnection;
css::uno::Reference< css::beans::XPropertySet > m_xColumn;
@@ -64,10 +63,9 @@ class OColumnControlModel : public ::comphelper::OMutexAndBroadcastHelper
protected:
virtual ~OColumnControlModel() override;
- OColumnControlModel(const OColumnControlModel* _pSource
- ,const css::uno::Reference< css::lang::XMultiServiceFactory>& _rxFactory);
+ OColumnControlModel(const OColumnControlModel* _pSource);
public:
- explicit OColumnControlModel(const css::uno::Reference< css::lang::XMultiServiceFactory>& _rxFactory);
+ explicit OColumnControlModel();
// UNO binding
DECLARE_XINTERFACE( )