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

Unwind comphelper::OPropertyContainer_Base typedef

Browse Source 
Change-Id: Ied87e18f8297fb8e85fdbcab38d719664e3ed066
This commit is contained in:
Stephan Bergmann 2014-02-12 10:47:43 +01:00
parent 9616b786ad
commit f45183d26f
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ using namespace ::com::sun::star::beans;
//========================================================================== //==========================================================================
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
OPropertyContainer::OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper) OPropertyContainer::OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper)
:OPropertyContainer_Base(_rBHelper) :OPropertySetHelper(_rBHelper)
{ {
} }
@ -66,7 +66,7 @@ Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{ {
OPropertyContainer_Base::setFastPropertyValue( nHandle, rValue ); OPropertySetHelper::setFastPropertyValue( nHandle, rValue );
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------

8
include/comphelper/propertycontainer.hxx
View File

@ -30,10 +30,6 @@ namespace comphelper
{ {
//......................................................................... //.........................................................................
//==========================================================================
//= OPropertyContainer
//==========================================================================
typedef ::cppu::OPropertySetHelper OPropertyContainer_Base;
/** a OPropertySetHelper implementation which is just a simple container for properties represented /** a OPropertySetHelper implementation which is just a simple container for properties represented
by class members, usually in a derived class. by class members, usually in a derived class.
<BR> <BR>
@ -42,7 +38,7 @@ typedef ::cppu::OPropertySetHelper OPropertyContainer_Base;
values which already have the correct type, it's unable to convert, for instance, a long to a short. values which already have the correct type, it's unable to convert, for instance, a long to a short.
*/ */
class COMPHELPER_DLLPUBLIC OPropertyContainer class COMPHELPER_DLLPUBLIC OPropertyContainer
:public OPropertyContainer_Base :public cppu::OPropertySetHelper
,public OPropertyContainerHelper ,public OPropertyContainerHelper
{ {
public: public:
@ -70,7 +66,7 @@ protected:
throw (::com::sun::star::uno::Exception, throw (::com::sun::star::uno::Exception,
std::exception); std::exception);
using OPropertyContainer_Base::getFastPropertyValue; using OPropertySetHelper::getFastPropertyValue;
virtual void SAL_CALL getFastPropertyValue( virtual void SAL_CALL getFastPropertyValue(
::com::sun::star::uno::Any& rValue, ::com::sun::star::uno::Any& rValue,
sal_Int32 nHandle sal_Int32 nHandle