mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need for a virtual OPropertyContainer::getTypes

Browse Source 
(and rename to getBaseTypes for clarity)

Change-Id: Icfe6202eea9b1f4ec2e46ade3fc8e001ca6b649f
This commit is contained in:
Stephan Bergmann
2014-03-14 16:33:46 +01:00
parent 849fb80648
commit 98666e8625
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basctl/source/basicide/basidectrlr.cxx
View File

@@ -82,7 +82,7 @@ Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException, std::ex
{ {
Sequence< Type > aTypes = ::comphelper::concatSequences( Sequence< Type > aTypes = ::comphelper::concatSequences(
SfxBaseController::getTypes(), SfxBaseController::getTypes(),
OPropertyContainer::getTypes() getBaseTypes()
); );
return aTypes; return aTypes;

2
comphelper/source/property/propertycontainer.cxx
View File

@@ -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 // just the types from our one and only base class
::cppu::OTypeCollection aTypes( ::cppu::OTypeCollection aTypes(

2
connectivity/source/drivers/evoab2/NResultSet.cxx
View File

@@ -732,7 +732,7 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) throw( RuntimeException,
{ {
return ::comphelper::concatSequences( return ::comphelper::concatSequences(
OResultSet_BASE::getTypes(), OResultSet_BASE::getTypes(),
::comphelper::OPropertyContainer::getTypes() getBaseTypes()
); );
} }

2
dbaccess/source/core/api/column.cxx
View File

@@ -80,7 +80,7 @@ Sequence< Type > OColumn::getTypes() throw (RuntimeException, std::exception)
{ {
return ::comphelper::concatSequences( return ::comphelper::concatSequences(
OColumnBase::getTypes(), OColumnBase::getTypes(),
::comphelper::OPropertyContainer::getTypes() getBaseTypes()
); );
} }

2
include/comphelper/propertycontainer.hxx
View File

@@ -49,7 +49,7 @@ protected:
OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper); OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper);
/// for scripting : the types of the interfaces supported by this class /// 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 // OPropertySetHelper overridables
virtual sal_Bool SAL_CALL convertFastPropertyValue( virtual sal_Bool SAL_CALL convertFastPropertyValue(

2
svtools/source/uno/genericunodialog.cxx
View File

@@ -93,7 +93,7 @@ Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes( ) throw(RuntimeException,
{ {
return ::comphelper::concatSequences( return ::comphelper::concatSequences(
OGenericUnoDialogBase::getTypes(), OGenericUnoDialogBase::getTypes(),
::comphelper::OPropertyContainer::getTypes() getBaseTypes()
); );
} }

2
svtools/source/uno/toolboxcontroller.cxx
View File

@@ -153,7 +153,7 @@ css::uno::Sequence<css::uno::Type> ToolboxController::getTypes()
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
css::uno::Sequence<css::uno::Type> s1(ToolboxController_Base::getTypes()); 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(); sal_Int32 n = s1.getLength();
s1.realloc(n + s2.getLength()); s1.realloc(n + s2.getLength());
for (sal_Int32 i = 0; i != s2.getLength(); ++i) { for (sal_Int32 i = 0; i != s2.getLength(); ++i) {

2
toolkit/source/controls/geometrycontrolmodel.cxx
View File

@@ -139,7 +139,7 @@
// our own types // our own types
Sequence< Type > aTypes = ::comphelper::concatSequences( Sequence< Type > aTypes = ::comphelper::concatSequences(
OPropertySetAggregationHelper::getTypes(), OPropertySetAggregationHelper::getTypes(),
OPropertyContainer::getTypes(), getBaseTypes(),
OGCM_Base::getTypes() OGCM_Base::getTypes()
); );