[Libreoffice-commits] core.git: 6 commits - external/mysqlcppconn mysqlc/Library_mysqlc.mk mysqlc/source
Stephan Bergmann
sbergman at redhat.com
Mon Feb 3 02:16:27 PST 2014
external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 1
external/mysqlcppconn/patches/warnings.patch.0 | 11 +++++++
mysqlc/Library_mysqlc.mk | 2 -
mysqlc/source/mysqlc_connection.cxx | 18 ++++++++++--
mysqlc/source/mysqlc_connection.hxx | 12 +++++++-
mysqlc/source/mysqlc_databasemetadata.cxx | 27 +++++++++---------
mysqlc/source/mysqlc_preparedstatement.cxx | 18 +++++++++++-
mysqlc/source/mysqlc_preparedstatement.hxx | 12 +++++++-
mysqlc/source/mysqlc_resultset.cxx | 1
mysqlc/source/mysqlc_resultset.hxx | 11 ++++++-
mysqlc/source/mysqlc_statement.cxx | 26 ++++++++++++++---
mysqlc/source/mysqlc_statement.hxx | 12 +++++++-
mysqlc/source/mysqlc_subcomponent.hxx | 23 ---------------
13 files changed, 124 insertions(+), 50 deletions(-)
New commits:
commit 0b3aa592d1dcc870de8b7b30060b2dade4ac3b62
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 10:43:07 2014 +0100
Do not disable -Werror for mysqlc
Change-Id: Ie65e31e138262475f41cd56d8da8c39cdd8836b9
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 00c35e3..151c493 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Library_Library,mysqlc))
-$(eval $(call gb_Library_set_warnings_not_errors,mysqlc))
-
$(eval $(call gb_Library_add_cxxflags,mysqlc,-DRTL_DISABLE_FAST_STRING))
$(eval $(call gb_Library_use_externals,mysqlc,\
commit 01b7bab7139b7f902e5570fc311d47f2ba5ef0e1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 10:42:24 2014 +0100
auto_ptr -> heap_ptr
Change-Id: I1b11593fc936c0a4b45c319fd73ef3b629950752
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index a952559..0d5de2b 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -32,6 +32,7 @@
#include <cppconn/exception.h>
#include <cppconn/statement.h>
#include <cppuhelper/typeprovider.hxx>
+#include <o3tl/heap_ptr.hxx>
#include <osl/diagnose.h>
#include <osl/thread.h>
@@ -201,7 +202,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const OUString&
Reference< XResultSet > xResultSet;
try {
- std::auto_ptr< sql::ResultSet > rset(cppStatement->executeQuery(OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr()));
+ o3tl::heap_ptr< sql::ResultSet > rset(cppStatement->executeQuery(OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr()));
xResultSet = new OResultSet(this, rset.get(), m_pConnection->getConnectionEncoding());
rset.release();
} catch (const sql::SQLException &e) {
@@ -307,7 +308,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::getResultSet()
Reference< XResultSet > xResultSet;
try {
- std::auto_ptr< sql::ResultSet > rset(cppStatement->getResultSet());
+ o3tl::heap_ptr< sql::ResultSet > rset(cppStatement->getResultSet());
xResultSet = new OResultSet(this, rset.get(), m_pConnection->getConnectionEncoding());
rset.release();
} catch (const sql::SQLException &e) {
commit 9072e25992c43b8d79c44cdf025f8d97f3342a70
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 10:34:11 2014 +0100
auto_ptr -> scoped_ptr
Change-Id: I878aae330a3b1658c8bca83bd8a1126d2a8d26b6
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index 99d2f4c..bf086af 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "mysqlc_databasemetadata.hxx"
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
@@ -1566,7 +1567,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
- std::auto_ptr< sql::ResultSet> rset( meta->getCatalogs());
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getCatalogs());
sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) {
@@ -1601,7 +1602,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
- std::auto_ptr< sql::ResultSet> rset( meta->getSchemas());
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getSchemas());
sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) {
@@ -1650,7 +1651,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
- std::auto_ptr< sql::ResultSet> rset( meta->getColumnPrivileges(cat, sch, tab, cNamePattern.compare("")? cNamePattern:wild));
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getColumnPrivileges(cat, sch, tab, cNamePattern.compare("")? cNamePattern:wild));
sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount();
@@ -1692,7 +1693,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
try {
- std::auto_ptr< sql::ResultSet> rset( meta->getColumns(cat,
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getColumns(cat,
sPattern.compare("")? sPattern:wild,
tNamePattern.compare("")? tNamePattern:wild,
cNamePattern.compare("")? cNamePattern:wild));
@@ -1750,7 +1751,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
}
try {
- std::auto_ptr< sql::ResultSet> rset( meta->getTables(cat,
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getTables(cat,
sPattern.compare("")? sPattern:wild,
tNamePattern.compare("")? tNamePattern:wild,
tabTypes));
@@ -1818,7 +1819,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
try {
- std::auto_ptr< sql::ResultSet> rset( meta->getProcedures(cat,
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getProcedures(cat,
sPattern.compare("")? sPattern:wild,
pNamePattern.compare("")? pNamePattern:wild));
@@ -1878,7 +1879,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
- std::auto_ptr< sql::ResultSet> rset( meta->getExportedKeys(cat, sch, tab));
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getExportedKeys(cat, sch, tab));
sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) {
@@ -1920,7 +1921,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
- std::auto_ptr< sql::ResultSet> rset( meta->getImportedKeys(cat, sch, tab));
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getImportedKeys(cat, sch, tab));
sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) {
@@ -1961,7 +1962,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
- std::auto_ptr< sql::ResultSet> rset( meta->getPrimaryKeys(cat, sch, tab));
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getPrimaryKeys(cat, sch, tab));
sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) {
@@ -2004,7 +2005,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
- std::auto_ptr< sql::ResultSet> rset( meta->getIndexInfo(cat, sch, tab, unique, approximate));
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getIndexInfo(cat, sch, tab, unique, approximate));
sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) {
@@ -2047,7 +2048,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
- std::auto_ptr< sql::ResultSet> rset( meta->getBestRowIdentifier(cat, sch, tab, scope, nullable));
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getBestRowIdentifier(cat, sch, tab, scope, nullable));
sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) {
@@ -2108,7 +2109,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
}
} else {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
- std::auto_ptr< sql::ResultSet> rset( meta->getTablePrivileges(cat, sPattern.compare("")? sPattern:wild, tPattern.compare("")? tPattern:wild));
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getTablePrivileges(cat, sPattern.compare("")? sPattern:wild, tPattern.compare("")? tPattern:wild));
sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) {
@@ -2156,7 +2157,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
- std::auto_ptr< sql::ResultSet> rset( meta->getCrossReference(primaryCat, pSchema, pTable, foreignCat, fSchema, fTable));
+ boost::scoped_ptr< sql::ResultSet> rset( meta->getCrossReference(primaryCat, pSchema, pTable, foreignCat, fSchema, fTable));
sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) {
commit 9a5f4019e22af6a1bf3e9ed5cece59ef51307eaf
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 10:30:24 2014 +0100
-Wunused-parameter (when included from mysqlc/source/)
Change-Id: I4889864a3db2090c687c32e11d4d28c3dda63eb0
diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index dd2b98e..ddcb522 100644
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
external/mysqlcppconn/patches/default_to_protocol_tcp.patch \
external/mysqlcppconn/patches/retrieve_grants.patch.1 \
+ external/mysqlcppconn/patches/warnings.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/patches/warnings.patch.0 b/external/mysqlcppconn/patches/warnings.patch.0
new file mode 100644
index 0000000..2cda42d
--- /dev/null
+++ b/external/mysqlcppconn/patches/warnings.patch.0
@@ -0,0 +1,11 @@
+--- cppconn/warning.h
++++ cppconn/warning.h
+@@ -59,7 +59,7 @@
+
+ virtual ~SQLWarning(){};
+
+- SQLWarning(const SQLWarning& e){};
++ SQLWarning(const SQLWarning&){};
+
+ private:
+ const SQLWarning & operator = (const SQLWarning & rhs);
commit c2c9e3969c0421bdbb71d314af928260e1ba4fb4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 10:23:35 2014 +0100
USE_CPP_CONN is unused
...ever since 4946c62f2943dfb3466cc4214a9c8ccd922669b5 "mysqlconnector: initial
import from CWS mysqlnative"
Change-Id: I787d2ac5e48be307f47e41ecac907c36b07a92ea
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index ed8826e..a952559 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -35,8 +35,6 @@
#include <osl/diagnose.h>
#include <osl/thread.h>
-#define USE_CPP_CONN 1
-
using namespace connectivity::mysqlc;
//------------------------------------------------------------------------------
using namespace com::sun::star::uno;
commit 396248a6bf276693619b319ee0efe5f21cde1d3e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 3 10:06:44 2014 +0100
Get rid of macros
Change-Id: Ic43441201309c3b466ed3dc7a5e85d0d006c0e44
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 8816cb2..e7f9ef8 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -221,10 +221,24 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
}
/* }}} */
+OUString OConnection::getImplementationName() throw (css::uno::RuntimeException)
+{
+ return OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection");
+}
-// XServiceInfo
-IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.mysqlc.OConnection", "com.sun.star.sdbc.Connection")
+css::uno::Sequence<OUString> OConnection::getSupportedServiceNames()
+ throw (css::uno::RuntimeException)
+{
+ css::uno::Sequence<OUString> s(1);
+ s[0] = "com.sun.star.sdbc.Connection";
+ return s;
+}
+sal_Bool OConnection::supportsService(OUString const & ServiceName)
+ throw (css::uno::RuntimeException)
+{
+ return cppu::supportsService(this, ServiceName);
+}
/* {{{ OConnection::createStatement() -I- */
Reference< XStatement > SAL_CALL OConnection::createStatement()
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index e9619e9..0bd1b82 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -147,7 +147,17 @@ namespace connectivity
virtual void SAL_CALL release() throw();
// XServiceInfo
- DECLARE_SERVICE_INFO();
+ virtual OUString SAL_CALL getImplementationName()
+ throw (css::uno::RuntimeException) SAL_OVERRIDE;
+
+ virtual sal_Bool SAL_CALL supportsService(
+ OUString const & ServiceName) throw (css::uno::RuntimeException)
+ SAL_OVERRIDE;
+
+ virtual css::uno::Sequence<OUString> SAL_CALL
+ getSupportedServiceNames() throw (css::uno::RuntimeException)
+ SAL_OVERRIDE;
+
// XConnection
my_XStatementRef SAL_CALL createStatement()
throw(SQLException, RuntimeException);
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
index 31c0f82..d495ed4 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -59,9 +59,25 @@ static inline char * my_i_to_a(char * buf, size_t buf_size, int a)
}
/* }}} */
+OUString OPreparedStatement::getImplementationName()
+ throw (css::uno::RuntimeException)
+{
+ return OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement");
+}
-IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mysqlc.PreparedStatement","com.sun.star.sdbc.PreparedStatement");
+css::uno::Sequence<OUString> OPreparedStatement::getSupportedServiceNames()
+ throw (css::uno::RuntimeException)
+{
+ css::uno::Sequence<OUString> s(1);
+ s[0] = "com.sun.star.sdbc.PreparedStatement";
+ return s;
+}
+sal_Bool OPreparedStatement::supportsService(OUString const & ServiceName)
+ throw (css::uno::RuntimeException)
+{
+ return cppu::supportsService(this, ServiceName);
+}
/* {{{ OPreparedStatement::OPreparedStatement() -I- */
OPreparedStatement::OPreparedStatement(OConnection* _pConnection, sql::PreparedStatement * _cppPrepStmt)
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx
index 8e167e4..9acd632 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -62,7 +62,17 @@ namespace connectivity
throw (::com::sun::star::uno::Exception);
virtual ~OPreparedStatement();
public:
- DECLARE_SERVICE_INFO();
+ virtual OUString SAL_CALL getImplementationName()
+ throw (css::uno::RuntimeException) SAL_OVERRIDE;
+
+ virtual sal_Bool SAL_CALL supportsService(
+ OUString const & ServiceName) throw (css::uno::RuntimeException)
+ SAL_OVERRIDE;
+
+ virtual css::uno::Sequence<OUString> SAL_CALL
+ getSupportedServiceNames() throw (css::uno::RuntimeException)
+ SAL_OVERRIDE;
+
OPreparedStatement(OConnection* _pConnection, sql::PreparedStatement * cppPrepStmt);
//XInterface
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index 5603348..1ad625d 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -49,7 +49,6 @@ using ::osl::MutexGuard;
#include <stdio.h>
-// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
/* {{{ OResultSet::getImplementationName() -I- */
OUString SAL_CALL OResultSet::getImplementationName()
throw (RuntimeException)
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
index fd22c99..465e81c 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -93,7 +93,16 @@ namespace connectivity
virtual ~OResultSet();
public:
- DECLARE_SERVICE_INFO();
+ virtual OUString SAL_CALL getImplementationName()
+ throw (css::uno::RuntimeException) SAL_OVERRIDE;
+
+ virtual sal_Bool SAL_CALL supportsService(
+ OUString const & ServiceName) throw (css::uno::RuntimeException)
+ SAL_OVERRIDE;
+
+ virtual css::uno::Sequence<OUString> SAL_CALL
+ getSupportedServiceNames() throw (css::uno::RuntimeException)
+ SAL_OVERRIDE;
OResultSet( OCommonStatement* pStmt, sql::ResultSet *result, rtl_TextEncoding _encoding );
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index ddfe5f6..ed8826e 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -457,7 +457,24 @@ void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) con
}
/* }}} */
-IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.OStatement","com.sun.star.sdbc.Statement");
+OUString OStatement::getImplementationName() throw (css::uno::RuntimeException)
+{
+ return OUString("com.sun.star.sdbcx.OStatement");
+}
+
+css::uno::Sequence<OUString> OStatement::getSupportedServiceNames()
+ throw (css::uno::RuntimeException)
+{
+ css::uno::Sequence<OUString> s(1);
+ s[0] = "com.sun.star.sdbc.Statement";
+ return s;
+}
+
+sal_Bool OStatement::supportsService(OUString const & ServiceName)
+ throw (css::uno::RuntimeException)
+{
+ return cppu::supportsService(this, ServiceName);
+}
/* {{{ OCommonStatement::acquire() -I- */
void SAL_CALL OCommonStatement::acquire()
diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx
index a58a9c5..a8fa0cc 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -173,7 +173,17 @@ namespace connectivity
public:
// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
OStatement(OConnection* _pConnection, sql::Statement *_cppStatement) : OCommonStatement(_pConnection, _cppStatement) {}
- DECLARE_SERVICE_INFO();
+
+ virtual OUString SAL_CALL getImplementationName()
+ throw (css::uno::RuntimeException) SAL_OVERRIDE;
+
+ virtual sal_Bool SAL_CALL supportsService(
+ OUString const & ServiceName) throw (css::uno::RuntimeException)
+ SAL_OVERRIDE;
+
+ virtual css::uno::Sequence<OUString> SAL_CALL
+ getSupportedServiceNames() throw (css::uno::RuntimeException)
+ SAL_OVERRIDE;
Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
throw(RuntimeException);
diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx
index 5aaf5e9..2c7bfa5 100644
--- a/mysqlc/source/mysqlc_subcomponent.hxx
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -194,29 +194,8 @@ namespace connectivity
return aReturn;
}
}
-
-#define DECLARE_SERVICE_INFO() \
- virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); \
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); \
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
-
-#define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \
- OUString SAL_CALL classname::getImplementationName() throw (::com::sun::star::uno::RuntimeException) \
- { \
- return OUString::createFromAscii(implasciiname); \
- } \
- ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \
- { \
- ::com::sun::star::uno::Sequence< OUString > aSupported(1); \
- aSupported[0] = OUString::createFromAscii(serviceasciiname); \
- return aSupported; \
- } \
- sal_Bool SAL_CALL classname::supportsService(const OUString& _rServiceName) throw(::com::sun::star::uno::RuntimeException) \
- { \
- return cppu::supportsService(this, _rServiceName); \
- }
-
}
+
#endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list