No need for a virtual OPropertyContainer::getTypes

(and rename to getBaseTypes for clarity)

Change-Id: Icfe6202eea9b1f4ec2e46ade3fc8e001ca6b649f

8 files changed, 8 insertions, 8 deletions

diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index 1ed82b460f0c..c20d4b3e2e06 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -82,7 +82,7 @@ Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException, std::ex
 {
     Sequence< Type > aTypes = ::comphelper::concatSequences(
         SfxBaseController::getTypes(),
-        OPropertyContainer::getTypes()
+        getBaseTypes()
     );
 
     return aTypes;
diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index b2e5fed945ce..83a6eae1c5e2 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -52,7 +52,7 @@ OPropertyContainer::~OPropertyContainer()
 }
 
 
-Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OPropertyContainer::getBaseTypes() throw (RuntimeException, std::exception)
 {
     // just the types from our one and only base class
     ::cppu::OTypeCollection aTypes(
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index a79eb5bdb62a..a4f67af5cc00 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -732,7 +732,7 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes(  ) throw( RuntimeException,
 {
     return ::comphelper::concatSequences(
         OResultSet_BASE::getTypes(),
-        ::comphelper::OPropertyContainer::getTypes()
+        getBaseTypes()
     );
 }
 
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index b9986861308b..fb5e44905bf3 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -80,7 +80,7 @@ Sequence< Type > OColumn::getTypes() throw (RuntimeException, std::exception)
 {
     return ::comphelper::concatSequences(
         OColumnBase::getTypes(),
-        ::comphelper::OPropertyContainer::getTypes()
+        getBaseTypes()
     );
 }
 
diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx
index 2f620e977e7b..a674e2b55125 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -49,7 +49,7 @@ protected:
     OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper);
 
     /// for scripting : the types of the interfaces supported by this class
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > getBaseTypes() throw (::com::sun::star::uno::RuntimeException, std::exception);
 
 // OPropertySetHelper overridables
     virtual sal_Bool SAL_CALL convertFastPropertyValue(
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index ba58a6281387..771420065f1f 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -93,7 +93,7 @@ Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes(  ) throw(RuntimeException,
 {
     return ::comphelper::concatSequences(
         OGenericUnoDialogBase::getTypes(),
-        ::comphelper::OPropertyContainer::getTypes()
+        getBaseTypes()
     );
 }
 
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 95addd72ff6c..a7ebe11b55b3 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -153,7 +153,7 @@ css::uno::Sequence<css::uno::Type> ToolboxController::getTypes()
     throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence<css::uno::Type> s1(ToolboxController_Base::getTypes());
-    css::uno::Sequence<css::uno::Type> s2(OPropertyContainer::getTypes());
+    css::uno::Sequence<css::uno::Type> s2(getBaseTypes());
     sal_Int32 n = s1.getLength();
     s1.realloc(n + s2.getLength());
     for (sal_Int32 i = 0; i != s2.getLength(); ++i) {
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 650b6319f8f9..786e0b3fcf17 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -139,7 +139,7 @@
         // our own types
         Sequence< Type > aTypes = ::comphelper::concatSequences(
             OPropertySetAggregationHelper::getTypes(),
-            OPropertyContainer::getTypes(),
+            getBaseTypes(),
             OGCM_Base::getTypes()
         );