summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2022-01-22 10:58:17 +0100
committerJulien Nabet <serval2412@yahoo.fr>2022-01-22 14:26:18 +0100
commit7da9683f63dd2acf4a74ef40de6add112d60bd4d (patch)
tree05de962e60e0fc398402fbc25c2e113be531e112
parentresave with latest glade (diff)
downloadcore-7da9683f63dd2acf4a74ef40de6add112d60bd4d.tar.gz
core-7da9683f63dd2acf4a74ef40de6add112d60bd4d.zip
Mysql/MariaDB: Clean mysqlc_view + remove using
Change-Id: I6fcb2f2c4346e6293a1e40e6f143ef6e8a68ee8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128760 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_view.cxx23
1 files changed, 4 insertions, 19 deletions
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_view.cxx b/connectivity/source/drivers/mysqlc/mysqlc_view.cxx
index a586e20a9a13..86837381d2bc 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_view.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_view.cxx
@@ -21,26 +21,11 @@
#include <propertyids.hxx>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/SQLException.hpp>
namespace connectivity::mysqlc
{
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::sdbc::SQLException;
-using ::com::sun::star::sdbc::XConnection;
-using ::com::sun::star::lang::WrappedTargetException;
-using ::com::sun::star::sdbc::XResultSet;
-using ::com::sun::star::sdbc::XStatement;
-using ::com::sun::star::lang::DisposedException;
-using ::com::sun::star::sdbc::XRow;
-
-View::View(const Reference<XConnection>& _rxConnection, bool _bCaseSensitive,
+View::View(const css::uno::Reference<css::sdbc::XConnection>& _rxConnection, bool _bCaseSensitive,
const OUString& _rSchemaName, const OUString& _rName)
: View_Base(_bCaseSensitive, _rName, _rxConnection->getMetaData(), OUString(), _rSchemaName,
OUString())
@@ -76,7 +61,7 @@ void SAL_CALL View::alterCommand(const OUString& _rNewCommand)
m_xMetaData->getConnection()->createStatement()->execute(aCommand);
}
-void SAL_CALL View::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
+void SAL_CALL View::getFastPropertyValue(css::uno::Any& _rValue, sal_Int32 _nHandle) const
{
if (_nHandle == PROPERTY_ID_COMMAND)
{
@@ -94,7 +79,7 @@ OUString View::impl_getCommand() const
OUString aCommand("SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = '"
+ m_SchemaName + "' AND TABLE_NAME = '" + m_Name + "'");
//::utl::SharedUNOComponent< XStatement > xStatement; xStatement.set( m_xConnection->createStatement(), UNO_QUERY_THROW );
- Reference<XResultSet> xResult(
+ css::uno::Reference<css::sdbc::XResultSet> xResult(
m_xMetaData->getConnection()->createStatement()->executeQuery(aCommand),
css::uno::UNO_SET_THROW);
if (!xResult->next())
@@ -104,7 +89,7 @@ OUString View::impl_getCommand() const
std::abort();
}
- Reference<XRow> xRow(xResult, UNO_QUERY_THROW);
+ css::uno::Reference<css::sdbc::XRow> xRow(xResult, css::uno::UNO_QUERY_THROW);
return xRow->getString(1);
}