diff options
Diffstat (limited to 'cppuhelper/source/typemanager.cxx')
| -rw-r--r-- | cppuhelper/source/typemanager.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index 7faddafee8ce..baa421996e05 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/TypeClass.hpp> #include <cppu/unotype.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/file.hxx> #include <osl/mutex.hxx> @@ -80,7 +80,7 @@ css::uno::Any resolveTypedefs(css::uno::Any const & type) { } class SimpleTypeDescription: - public cppu::WeakImplHelper1< css::reflection::XTypeDescription > + public cppu::WeakImplHelper< css::reflection::XTypeDescription > { public: SimpleTypeDescription( @@ -103,7 +103,7 @@ private: }; class SequenceTypeDescription: - public cppu::WeakImplHelper1< css::reflection::XIndirectTypeDescription > + public cppu::WeakImplHelper< css::reflection::XIndirectTypeDescription > { public: SequenceTypeDescription( @@ -132,7 +132,7 @@ private: }; class PublishableDescription: - public cppu::WeakImplHelper1< css::reflection::XPublished > + public cppu::WeakImplHelper< css::reflection::XPublished > { protected: explicit PublishableDescription(bool published): published_(published) {} @@ -147,7 +147,7 @@ private: }; class ModuleDescription: - public cppu::WeakImplHelper1< css::reflection::XModuleTypeDescription > + public cppu::WeakImplHelper< css::reflection::XModuleTypeDescription > { public: ModuleDescription( @@ -196,7 +196,7 @@ ModuleDescription::getMembers() throw (css::uno::RuntimeException, std::exceptio } } -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XEnumTypeDescription > EnumTypeDescription_Base; @@ -257,7 +257,7 @@ css::uno::Sequence< sal_Int32 > EnumTypeDescription::getEnumValues() return s; } -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XStructTypeDescription > PlainStructTypeDescription_Base; @@ -339,7 +339,7 @@ css::uno::Sequence< rtl::OUString > PlainStructTypeDescription::getMemberNames() } class ParameterizedMemberTypeDescription: - public cppu::WeakImplHelper1< css::reflection::XTypeDescription > + public cppu::WeakImplHelper< css::reflection::XTypeDescription > { public: explicit ParameterizedMemberTypeDescription( @@ -360,7 +360,7 @@ private: rtl::OUString typeParameterName_; }; -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XStructTypeDescription > PolymorphicStructTypeTemplateDescription_Base; @@ -459,7 +459,7 @@ PolymorphicStructTypeTemplateDescription::getTypeParameters() } class InstantiatedPolymorphicStructTypeDescription: - public cppu::WeakImplHelper1< css::reflection::XStructTypeDescription > + public cppu::WeakImplHelper< css::reflection::XStructTypeDescription > { public: InstantiatedPolymorphicStructTypeDescription( @@ -566,7 +566,7 @@ InstantiatedPolymorphicStructTypeDescription::getTypeArguments() return s; } -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XCompoundTypeDescription > ExceptionTypeDescription_Base; @@ -635,7 +635,7 @@ css::uno::Sequence< rtl::OUString > ExceptionTypeDescription::getMemberNames() } class AttributeDescription: - public cppu::WeakImplHelper1< + public cppu::WeakImplHelper< css::reflection::XInterfaceAttributeTypeDescription2 > { public: @@ -722,7 +722,7 @@ AttributeDescription::getSetExceptions() throw (css::uno::RuntimeException, std: } class MethodParameter: - public cppu::WeakImplHelper1< css::reflection::XMethodParameter > + public cppu::WeakImplHelper< css::reflection::XMethodParameter > { public: MethodParameter( @@ -769,7 +769,7 @@ private: }; class MethodDescription: - public cppu::WeakImplHelper1< + public cppu::WeakImplHelper< css::reflection::XInterfaceMethodTypeDescription > { public: @@ -901,7 +901,7 @@ void BaseOffset::calculate( } } -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XInterfaceTypeDescription2 > InterfaceTypeDescription_Base; @@ -1012,7 +1012,7 @@ InterfaceTypeDescription::getOptionalBaseTypes() } class ConstantDescription: - public cppu::WeakImplHelper1< css::reflection::XConstantTypeDescription > + public cppu::WeakImplHelper< css::reflection::XConstantTypeDescription > { public: ConstantDescription( @@ -1078,7 +1078,7 @@ ConstantDescription::ConstantDescription( } } -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XConstantsTypeDescription > ConstantGroupDescription_Base; @@ -1123,7 +1123,7 @@ ConstantGroupDescription::getConstants() throw (css::uno::RuntimeException, std: return s; } -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XIndirectTypeDescription > TypedefDescription_Base; @@ -1157,7 +1157,7 @@ private: }; class ConstructorParameter: - public cppu::WeakImplHelper1< css::reflection::XParameter > + public cppu::WeakImplHelper< css::reflection::XParameter > { public: ConstructorParameter( @@ -1198,7 +1198,7 @@ private: }; class ConstructorDescription: - public cppu::WeakImplHelper1< + public cppu::WeakImplHelper< css::reflection::XServiceConstructorDescription > { public: @@ -1261,7 +1261,7 @@ ConstructorDescription::getExceptions() throw (css::uno::RuntimeException, std:: return s; } -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XServiceTypeDescription2 > SingleInterfaceBasedServiceDescription_Base; @@ -1372,7 +1372,7 @@ SingleInterfaceBasedServiceDescription::getConstructors() } class PropertyDescription: - public cppu::WeakImplHelper1< css::reflection::XPropertyTypeDescription > + public cppu::WeakImplHelper< css::reflection::XPropertyTypeDescription > { public: PropertyDescription( @@ -1403,7 +1403,7 @@ private: unoidl::AccumulationBasedServiceEntity::Property property_; }; -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XServiceTypeDescription2 > AccumulationBasedServiceDescription_Base; @@ -1574,7 +1574,7 @@ AccumulationBasedServiceDescription::getProperties() return s; } -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XSingletonTypeDescription2 > InterfaceBasedSingletonDescription_Base; @@ -1620,7 +1620,7 @@ private: rtl::Reference< unoidl::InterfaceBasedSingletonEntity > entity_; }; -typedef cppu::ImplInheritanceHelper1< +typedef cppu::ImplInheritanceHelper< PublishableDescription, css::reflection::XSingletonTypeDescription2 > ServiceBasedSingletonDescription_Base; @@ -1667,7 +1667,7 @@ private: }; class Enumeration: - public cppu::WeakImplHelper1< css::reflection::XTypeDescriptionEnumeration > + public cppu::WeakImplHelper< css::reflection::XTypeDescriptionEnumeration > { public: Enumeration( |