diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-12 10:47:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-12 12:03:28 +0100 |
| commit | f45183d26f45d1e19a474e24e6c9c530808ca35d (patch) | |
| tree | a10ac3ae367a969da33cb9be59f4a5f5f426cd15 | |
| parent | fdo#45003 PDF import: Implementing linejoin and linecap properties (diff) | |
| download | core-f45183d26f45d1e19a474e24e6c9c530808ca35d.tar.gz core-f45183d26f45d1e19a474e24e6c9c530808ca35d.zip | |
Unwind comphelper::OPropertyContainer_Base typedef
Change-Id: Ied87e18f8297fb8e85fdbcab38d719664e3ed066
| -rw-r--r-- | comphelper/source/property/propertycontainer.cxx | 4 | ||||
| -rw-r--r-- | include/comphelper/propertycontainer.hxx | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx index a322ff1b1cee..98e9439a687b 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::beans; //========================================================================== //-------------------------------------------------------------------------- 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) { - OPropertyContainer_Base::setFastPropertyValue( nHandle, rValue ); + OPropertySetHelper::setFastPropertyValue( nHandle, rValue ); } //-------------------------------------------------------------------------- diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx index a594b71e9ea2..9070a694b0d2 100644 --- a/include/comphelper/propertycontainer.hxx +++ b/include/comphelper/propertycontainer.hxx @@ -30,10 +30,6 @@ namespace comphelper { //......................................................................... -//========================================================================== -//= OPropertyContainer -//========================================================================== -typedef ::cppu::OPropertySetHelper OPropertyContainer_Base; /** a OPropertySetHelper implementation which is just a simple container for properties represented by class members, usually in a derived class. <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. */ class COMPHELPER_DLLPUBLIC OPropertyContainer - :public OPropertyContainer_Base + :public cppu::OPropertySetHelper ,public OPropertyContainerHelper { public: @@ -70,7 +66,7 @@ protected: throw (::com::sun::star::uno::Exception, std::exception); - using OPropertyContainer_Base::getFastPropertyValue; + using OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle |