[Libreoffice-commits] core.git: 2 commits - dbaccess/Library_dba.mk dbaccess/source
Matúš Kukan
matus.kukan at gmail.com
Fri Dec 18 07:52:04 PST 2015
dbaccess/Library_dba.mk | 1
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 30 ++++---------
dbaccess/source/core/dataaccess/databasecontext.cxx | 1
dbaccess/source/core/inc/module_dba.hxx | 34 ---------------
dbaccess/source/core/misc/module_dba.cxx | 29 ------------
5 files changed, 10 insertions(+), 85 deletions(-)
New commits:
commit e0075eb0c0b87f52ed74e19133d26cbd8138bb39
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Nov 21 01:46:57 2015 +0100
dbaccess: module_dba not used anymore
Change-Id: I6f9222dd40c553e1d0ad63e00e5874be939a97c1
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 6ed0a2b..beeddad 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,dba,\
dbaccess/source/core/misc/ContainerMediator \
dbaccess/source/core/misc/DatabaseDataProvider \
dbaccess/source/core/misc/dsntypes \
- dbaccess/source/core/misc/module_dba \
dbaccess/source/core/misc/objectnameapproval \
dbaccess/source/core/misc/PropertyForward \
dbaccess/source/core/misc/sdbcoretools \
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 8ff8df3..b12ace6 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -27,7 +27,6 @@
#include "databaseregistrations.hxx"
#include "datasource.hxx"
#include "dbastrings.hrc"
-#include "module_dba.hxx"
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/inc/module_dba.hxx b/dbaccess/source/core/inc/module_dba.hxx
deleted file mode 100644
index c79b53c..0000000
--- a/dbaccess/source/core/inc/module_dba.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
-
-#include <unotools/componentresmodule.hxx>
-
-namespace dba
-{
-
- DEFINE_MODULE( DbaModule, DbaClient, DbaRes )
-
-} // namespace sdbtools
-
-#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/module_dba.cxx b/dbaccess/source/core/misc/module_dba.cxx
deleted file mode 100644
index 7b554e7..0000000
--- a/dbaccess/source/core/misc/module_dba.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "module_dba.hxx"
-
-namespace dba
-{
-
- IMPLEMENT_MODULE( DbaModule, "dba" )
-
-} // namespace sdbtools
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 30289fcab7fdeb21e8380d55d2ae550fc888e6f5
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Dec 13 12:51:52 2015 +0100
XComponentContext not needed for DataAccessDescriptor
Change-Id: If5ede0c308930d37bff9e97afc8a76cc5b709034
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index e351d29..13df4cf 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -42,7 +42,6 @@ namespace
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::XComponentContext;
using ::com::sun::star::lang::XServiceInfo;
using ::com::sun::star::beans::XPropertySetInfo;
using ::com::sun::star::beans::Property;
@@ -68,7 +67,7 @@ namespace
,public ::comphelper::OPropertyArrayUsageHelper< DataAccessDescriptor >
{
public:
- explicit DataAccessDescriptor( const Reference<XComponentContext> & _rContext );
+ DataAccessDescriptor();
// UNO
DECLARE_XINTERFACE()
@@ -91,8 +90,6 @@ namespace
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
private:
- Reference<XComponentContext> m_xContext;
-
// </properties>
OUString m_sDataSourceName;
OUString m_sDatabaseLocation;
@@ -117,11 +114,10 @@ namespace
#define REGISTER_PROPERTY( propname, member ) \
registerProperty( PROPERTY_##propname, PROPERTY_ID_##propname, PropertyAttribute::BOUND, &member, cppu::UnoType<decltype(member)>::get() )
- DataAccessDescriptor::DataAccessDescriptor( const Reference<XComponentContext> & _rContext )
+ DataAccessDescriptor::DataAccessDescriptor()
:DataAccessDescriptor_MutexBase()
,DataAccessDescriptor_TypeBase()
,DataAccessDescriptor_PropertyBase( m_aBHelper )
- ,m_xContext( _rContext )
,m_sDataSourceName()
,m_sDatabaseLocation()
,m_sConnectionResource()
@@ -213,15 +209,11 @@ namespace
// XDataAccessDescriptorFactory
virtual Reference< XPropertySet > SAL_CALL createDataAccessDescriptor( ) throw (RuntimeException, std::exception) override;
- explicit DataAccessDescriptorFactory( const Reference< XComponentContext >& _rxContext );
+ DataAccessDescriptorFactory();
virtual ~DataAccessDescriptorFactory();
-
- private:
- Reference<XComponentContext> m_xContext;
};
- DataAccessDescriptorFactory::DataAccessDescriptorFactory( const Reference< XComponentContext >& _rxContext )
- :m_xContext( _rxContext )
+ DataAccessDescriptorFactory::DataAccessDescriptorFactory()
{
}
@@ -247,31 +239,29 @@ namespace
Reference< XPropertySet > SAL_CALL DataAccessDescriptorFactory::createDataAccessDescriptor( ) throw (RuntimeException, std::exception)
{
- return new DataAccessDescriptor( m_xContext );
+ return new DataAccessDescriptor();
}
struct Instance {
- explicit Instance(
- css::uno::Reference<css::uno::XComponentContext> const & context):
- instance(new DataAccessDescriptorFactory(context))
+ explicit Instance():
+ instance(new DataAccessDescriptorFactory())
{}
css::uno::Reference<cppu::OWeakObject> instance;
};
struct Singleton:
- public rtl::StaticWithArg<
- Instance, css::uno::Reference<css::uno::XComponentContext>, Singleton>
+ public rtl::Static<Instance, Singleton>
{};
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
com_sun_star_comp_dba_DataAccessDescriptorFactory(
- css::uno::XComponentContext *context,
+ css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(Singleton::get(context).instance.get());
+ return cppu::acquire(Singleton::get().instance.get());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list