2 files changed, 18 insertions, 36 deletions
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 3b5197df500e..f282d8575992 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -145,56 +145,47 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
-    sal_Int32 nValue = 65535; // 0 means no limit
-    return nValue;
+    return 65535; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  )
 {
-    sal_Int32 nValue = 254; // 0 means no limit
-    return nValue;
+    return 254; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  )
 {
-    sal_Int32 nValue = 20; // 0 means no limit
-    return nValue;
+    return 20; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
@@ -204,8 +195,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
@@ -262,8 +252,7 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  )
@@ -412,14 +401,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  )
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  )
@@ -746,26 +733,22 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  )
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  )
 {
-    sal_Int32 nValue = 0; // 0 means no limit
-    return nValue;
+    return 0; // 0 means no limit
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ )
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 864dc83c7b1d..13cb0d280073 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -325,9 +325,8 @@ sal_Bool OCommonStatement::convertFastPropertyValue(
                             sal_Int32 /*nHandle*/,
                             const Any& /*rValue*/ )
 {
-    bool bConverted = false;
     // here we have to try to convert
-    return bConverted;
+    return false;
 }
 
 void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/)