diff options
| author | Noel Grandin <noel@peralex.com> | 2013-03-01 16:32:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-03-04 10:13:20 +0200 |
| commit | b313e37a92a18bc663ea5eb97ea0a569c6b0a962 (patch) | |
| tree | d23b3a673046bfe4dbb78d145aab4e9f425b8860 /forms | |
| parent | fb0f7c2415321a3bcae00802b98ae76144ea4e79 (diff) | |
fdo#46808, convert xforms::Model to new style
the service already existed, it just needed an IDL file.
Change-Id: Id8f33183d9332f9defd855b3a3c7413fde24a61b
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/xforms/model.hxx | 32 | ||||
| -rw-r--r-- | forms/source/xforms/xforms_services.cxx | 2 |
2 files changed, 31 insertions, 3 deletions
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index acbeff46366d..2e989ab1aa87 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -22,7 +22,7 @@ #include <cppuhelper/implbase4.hxx> #include <propertysetbase.hxx> -#include <com/sun/star/xforms/XModel.hpp> +#include <com/sun/star/xforms/XModel2.hpp> #include <com/sun/star/xforms/XFormsUIHelper1.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> @@ -68,7 +68,7 @@ namespace xforms */ typedef cppu::ImplInheritanceHelper4< PropertySetBase, - com::sun::star::xforms::XModel, + com::sun::star::xforms::XModel2, com::sun::star::xforms::XFormsUIHelper1, com::sun::star::util::XUpdatable, com::sun::star::lang::XUnoTunnel @@ -281,7 +281,35 @@ public: virtual XSet_t SAL_CALL getSubmissions() throw( RuntimeException_t ); + // XPropertySet + virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p) + throw( css::uno::RuntimeException ) + { return PropertySetBase::getPropertyValue(p); } + + virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) + throw( css::uno::RuntimeException ) + { PropertySetBase::addPropertyChangeListener(p1, p2); } + + virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) + throw( css::uno::RuntimeException ) + { PropertySetBase::removePropertyChangeListener(p1, p2); } + + virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) + throw( css::uno::RuntimeException ) + { PropertySetBase::addVetoableChangeListener(p1, p2); } + + virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) + throw( css::uno::RuntimeException ) + { PropertySetBase::removeVetoableChangeListener(p1, p2); } + + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() + throw( css::uno::RuntimeException ) + { return PropertySetBase::getPropertySetInfo(); } + + virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) + throw( css::uno::RuntimeException ) + { PropertySetBase::setPropertyValue(p1, p2); } // // XFormsUIHelper1 & friends: diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx index da09e6a911f1..7e03f9967239 100644 --- a/forms/source/xforms/xforms_services.cxx +++ b/forms/source/xforms/xforms_services.cxx @@ -46,7 +46,7 @@ Reference<XInterface> Model_CreateInstance( const Reference<XMultiServiceFactory>& ) throw( RuntimeException ) { - return static_cast<XPropertySet*>( new xforms::Model ); + return static_cast<XPropertySet*>( static_cast<PropertySetBase*>( new xforms::Model ) ); } Reference<XInterface> XForms_CreateInstance( |