Kaydet (Commit) 04422d7f authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:checkunusedparams in connectivity

Change-Id: I302af54f4bcb5807c264f7926cffa025550ccb00
Reviewed-on: https://gerrit.libreoffice.org/37065Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 7f207fca
...@@ -56,7 +56,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css ...@@ -56,7 +56,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css
{ {
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{ {
jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); jobject obj = convertTypeMapToJavaMap(typeMap);
static const char * const cSignature = "(Ljava/util/Map;)[Ljava/lang/Object;"; static const char * const cSignature = "(Ljava/util/Map;)[Ljava/lang/Object;";
static const char * const cMethodName = "getArray"; static const char * const cMethodName = "getArray";
static jmethodID mID(nullptr); static jmethodID mID(nullptr);
...@@ -74,7 +74,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sa ...@@ -74,7 +74,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sa
{ {
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{ {
jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); jobject obj = convertTypeMapToJavaMap(typeMap);
static const char * const cSignature = "(IILjava/util/Map;)[Ljava/lang/Object;"; static const char * const cSignature = "(IILjava/util/Map;)[Ljava/lang/Object;";
static const char * const cMethodName = "getArray"; static const char * const cMethodName = "getArray";
// submit Java-Call // submit Java-Call
...@@ -93,7 +93,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS ...@@ -93,7 +93,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{ {
// convert Parameter // convert Parameter
jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); jobject obj = convertTypeMapToJavaMap(typeMap);
// initialize temporary variable // initialize temporary variable
static const char * const cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;"; static const char * const cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;";
static const char * const cMethodName = "getResultSet"; static const char * const cMethodName = "getResultSet";
...@@ -113,7 +113,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS ...@@ -113,7 +113,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{ {
// convert parameter // convert parameter
jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); jobject obj = convertTypeMapToJavaMap(typeMap);
// initialize temporary variable // initialize temporary variable
static const char * const cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;"; static const char * const cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;";
static const char * const cMethodName = "getResultSetAtIndex"; static const char * const cMethodName = "getResultSetAtIndex";
......
...@@ -295,7 +295,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen ...@@ -295,7 +295,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen
jvalue args[2]; jvalue args[2];
// convert parameter // convert parameter
args[0].i = columnIndex; args[0].i = columnIndex;
args[1].l = convertTypeMapToJavaMap(t.pEnv,typeMap); args[1].l = convertTypeMapToJavaMap(typeMap);
// initialize temporary Variable // initialize temporary Variable
// Java-Call // Java-Call
static jmethodID mID(nullptr); static jmethodID mID(nullptr);
......
...@@ -173,7 +173,7 @@ OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring Str) ...@@ -173,7 +173,7 @@ OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring Str)
return aStr; return aStr;
} }
jobject connectivity::convertTypeMapToJavaMap(JNIEnv* /*pEnv*/,const Reference< css::container::XNameAccess > & _rMap) jobject connectivity::convertTypeMapToJavaMap(const Reference< css::container::XNameAccess > & _rMap)
{ {
if ( _rMap.is() ) if ( _rMap.is() )
{ {
......
...@@ -309,13 +309,6 @@ bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) ...@@ -309,13 +309,6 @@ bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload)
// Check whether we've already fetched the row... // Check whether we've already fetched the row...
if ( !(m_aRow->get())[0].isNull() && (sal_Int32)(m_aRow->get())[0] == cardNumber ) if ( !(m_aRow->get())[0].isNull() && (sal_Int32)(m_aRow->get())[0] == cardNumber )
return true; return true;
//Check whether the old row has been changed
if (cardNumber == m_nUpdatedRow)
{
//write back the changes first
if (!pushCard(cardNumber)) //error write back the changes
throw SQLException();
}
} }
// else // else
// m_aQuery.resyncRow(cardNumber); // m_aQuery.resyncRow(cardNumber);
......
...@@ -259,7 +259,6 @@ protected: ...@@ -259,7 +259,6 @@ protected:
/// @throws css::sdbc::SQLException /// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
bool fetchCurrentRow(); bool fetchCurrentRow();
static bool pushCard(sal_uInt32 ) { return true; }
bool validRow( sal_uInt32 nRow ); bool validRow( sal_uInt32 nRow );
bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 ); bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 );
sal_Int32 deletedCount(); sal_Int32 deletedCount();
......
...@@ -45,7 +45,7 @@ namespace connectivity ...@@ -45,7 +45,7 @@ namespace connectivity
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
java_util_Properties* createStringPropertyArray(const css::uno::Sequence< css::beans::PropertyValue >& info ); java_util_Properties* createStringPropertyArray(const css::uno::Sequence< css::beans::PropertyValue >& info );
jobject convertTypeMapToJavaMap(JNIEnv *pEnv,const css::uno::Reference< css::container::XNameAccess > & _rMap); jobject convertTypeMapToJavaMap(const css::uno::Reference< css::container::XNameAccess > & _rMap);
/** return if a exception occurred /** return if a exception occurred
@param pEnv @param pEnv
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment