summaryrefslogtreecommitdiffstats
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-01-20 16:36:19 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-01-21 07:18:38 +0000
commit90d892664a6c49a8ae25a72ddccf54dba9d0e429 (patch)
treed9bb4a7307e349b88a4d528854abb44e4323f563 /connectivity
parenttdf#74608 lotuswordpro: Constructor feature for LotusWordProImportFilter (diff)
downloadcore-90d892664a6c49a8ae25a72ddccf54dba9d0e429.tar.gz
core-90d892664a6c49a8ae25a72ddccf54dba9d0e429.zip
loplugin: unused return values
Change-Id: I4eb1f0c9245c04058fd5e47046f043f8840a79c7 Reviewed-on: https://gerrit.libreoffice.org/21628 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx56
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.cxx6
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.hxx2
-rw-r--r--connectivity/source/inc/java/sql/DriverPropertyInfo.hxx4
4 files changed, 2 insertions, 66 deletions
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 12e33af13cfa..1c8d6f98749c 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -48,45 +48,6 @@ jclass java_sql_DriverPropertyInfo::getMyClass() const
}
-OUString java_sql_DriverPropertyInfo::name()
-{
- OUString aStr;
- SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
-
- {
- jfieldID id = t.pEnv->GetFieldID(getMyClass(),"name","Ljava/lang/String;");
- if(id)
- aStr = JavaString2String(t.pEnv, static_cast<jstring>(t.pEnv->GetObjectField( object, id)));
- } //t.pEnv
- return aStr;
-}
-
-OUString java_sql_DriverPropertyInfo::description()
-{
- OUString aStr;
- SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
-
- {
- jfieldID id = t.pEnv->GetFieldID(getMyClass(),"description","Ljava/lang/String;");
- if(id)
- aStr = JavaString2String(t.pEnv, static_cast<jstring>(t.pEnv->GetObjectField( object, id)));
- } //t.pEnv
- return aStr;
-}
-
-OUString java_sql_DriverPropertyInfo::value()
-{
- OUString aStr;
- SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
-
- {
- jfieldID id = t.pEnv->GetFieldID(getMyClass(),"value","Ljava/lang/String;");
- if(id)
- aStr = JavaString2String(t.pEnv, static_cast<jstring>(t.pEnv->GetObjectField( object, id)));
- } //t.pEnv
- return aStr;
-}
-
bool java_sql_DriverPropertyInfo::required()
{
jboolean out(0);
@@ -100,21 +61,4 @@ bool java_sql_DriverPropertyInfo::required()
return out;
}
-Sequence< OUString> java_sql_DriverPropertyInfo::choices()
-{
- SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
-
- {
- jfieldID id = t.pEnv->GetFieldID(getMyClass(),"choices","[Ljava/lang/String;");
- if(id)
- {
- const java_lang_String * pEmpty = nullptr;
- const OUString * pEmpty2 = nullptr;
- return copyArrayAndDelete(t.pEnv, static_cast<jobjectArray>(t.pEnv->GetObjectField( object, id)), pEmpty2, pEmpty);
- }
- } //t.pEnv
- return Sequence< OUString>();
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 430c01f2d2f2..edd87db9720c 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -387,11 +387,8 @@ ORowSetValue& x)
}
-size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
+void OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
{
- // Count of the newly added Parameters
- size_t nParameter = m_xParamColumns->get().size()+1;
-
OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument is not a Parameter");
OSL_ENSURE(pParameter->count() > 0,"OResultSet: error in parse tree");
@@ -431,7 +428,6 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
,OUString()
,OUString());
m_xParamColumns->get().push_back(xParaColumn);
- return nParameter;
}
void OPreparedStatement::describeColumn(OSQLParseNode*
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx
index 9e7e7f60d3a9..305977b36c11 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx
@@ -71,7 +71,7 @@ namespace connectivity
void checkAndResizeParameters(sal_Int32 parameterIndex);
void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
- size_t AddParameter(connectivity::OSQLParseNode * pParameter,
+ void AddParameter(connectivity::OSQLParseNode * pParameter,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol);
void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes);
void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index 3380ef5bd05c..db86f2af73fe 100644
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
@@ -40,11 +40,7 @@ namespace connectivity
// A ctor that is needed for returning the object
java_sql_DriverPropertyInfo( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
- OUString name();
- OUString description();
- OUString value();
bool required();
- ::com::sun::star::uno::Sequence< OUString> choices();
};
}