From ff19246a810c891ab70da2006c29bbe2913c731e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 11 Mar 2014 12:48:18 +0100 Subject: [PATCH] OPropertyStateHelper::getTypes isn't an override of XTypeProvider::getTypes Change-Id: I633c711aabbd2ec7d1385d106b512f14672393f1 --- comphelper/source/property/propstate.cxx | 2 +- include/comphelper/propstate.hxx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index 6c21c1627b84..90d8e370e730 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -53,7 +53,7 @@ namespace comphelper } - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> OPropertyStateHelper::getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Sequence OPropertyStateHelper::getTypes() { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> aTypes(4); ::com::sun::star::uno::Type* pTypes = aTypes.getArray(); diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx index 070a8b299040..c62ae63acda2 100644 --- a/include/comphelper/propstate.hxx +++ b/include/comphelper/propstate.hxx @@ -75,8 +75,7 @@ namespace comphelper void firePropertyChange(sal_Int32 nHandle, const ::com::sun::star::uno::Any& aNewValue, const ::com::sun::star::uno::Any& aOldValue); - protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); + css::uno::Sequence getTypes(); };