[Libreoffice-commits] core.git: connectivity/source

[Stephan Bergmann]

 connectivity/source/drivers/macab/MacabRecords.cxx   |    6 +++---
 connectivity/source/drivers/macab/MacabResultSet.cxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 08367272b95a944cad6bf0bc6915544f2a6ee243
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jul 15 22:02:09 2016 +0200

    loplugin:redundantcast
    
    Change-Id: I2d963eb8395b8eca776032d32d72f5ec85891c70

diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 9ca9bca..7174e6d 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -710,7 +710,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
             /* Get the keys and values */
             dictKeys = static_cast<CFStringRef *>(malloc(sizeof(CFStringRef)*numRecords));
             dictValues = static_cast<CFTypeRef *>(malloc(sizeof(CFTypeRef)*numRecords));
-            CFDictionaryGetKeysAndValues(static_cast<CFDictionaryRef>(_propertyValue), reinterpret_cast<const void **>(dictKeys), static_cast<const void **>(dictValues));
+            CFDictionaryGetKeysAndValues(static_cast<CFDictionaryRef>(_propertyValue), reinterpret_cast<const void **>(dictKeys), dictValues);
 
             propertyNameString = CFStringToOUString(_propertyName);
 
@@ -792,7 +792,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
                  */
                 for(i = 0; i < arrLength; i++)
                 {
-                    arrValue = static_cast<CFTypeRef>(CFArrayGetValueAtIndex(static_cast<CFArrayRef>(_propertyValue), i));
+                    arrValue = CFArrayGetValueAtIndex(static_cast<CFArrayRef>(_propertyValue), i);
                     arrType = (ABPropertyType) getABTypeFromCFType( CFGetTypeID(arrValue) );
                     arrLabelString = propertyNameString + OUString::number(i);
                     arrLabel = OUStringToCFString(arrLabelString);
@@ -1021,7 +1021,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
                 CFTypeRef *dictValues;
                 dictKeys = static_cast<CFStringRef *>(malloc(sizeof(CFStringRef)*numRecords));
                 dictValues = static_cast<CFTypeRef *>(malloc(sizeof(CFTypeRef)*numRecords));
-                CFDictionaryGetKeysAndValues(static_cast<CFDictionaryRef>(_propertyValue), reinterpret_cast<const void **>(dictKeys), static_cast<const void **>(dictValues));
+                CFDictionaryGetKeysAndValues(static_cast<CFDictionaryRef>(_propertyValue), reinterpret_cast<const void **>(dictKeys), dictValues);
 
                 /* Going through each element... */
                 for(i = 0; i < numRecords; i++)
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index eaaa60e..e0e09ae 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -1007,7 +1007,7 @@ IPropertyArrayHelper* MacabResultSet::createArrayHelper() const
 
 IPropertyArrayHelper & MacabResultSet::getInfoHelper()
 {
-    return *static_cast<MacabResultSet*>(this)->getArrayHelper();
+    return *getArrayHelper();
 }
 
 sal_Bool MacabResultSet::convertFastPropertyValue(