diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-03-24 12:22:31 +0000 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-15 16:55:24 +0200 |
| commit | b2dfbdff7a7436c8fc4a8d2304f573bf783b2d32 (patch) | |
| tree | d44160484b4686c6455187197511a4ad67a85920 | |
| parent | da00f5e6249c1beef6e7c377398b33cc9af27d09 (diff) | |
i121944 - Implement inheritance in css::ucb::XWebDAVCommandEnvironment
It should be derived from css::ucb::XCommandEnvironment
(cherry picked from commit 817e11dccbfe3431f9cc0466051f4d154ce33e5e)
Conflicts:
extensions/source/update/feed/updatefeed.cxx
offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
offapi/type_reference/typelibrary_history.txt
offapi/type_reference/types.rdb
(Would be an incompatible API CHANGE if we had not unpublished
XWebDAVCommandEnvironment with 78cca63070ae6cf82b45ec3bc75fafa2db31a7f2 "Revert
publishing of lots of UNO types.")
Change-Id: Ie44bed44cce09c2423adab33c3790bdcb9be452d
| -rw-r--r-- | extensions/source/update/feed/updatefeed.cxx | 6 | ||||
| -rw-r--r-- | offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl | 9 |
2 files changed, 4 insertions, 11 deletions
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 2a51d954427a..96a9311b99c3 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -19,7 +19,7 @@ #include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase3.hxx> #include <cppuhelper/implementationentry.hxx> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -34,7 +34,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XWebDAVCommandEnvironment.hpp> #include <com/sun/star/ucb/XCommandProcessor2.hpp> #include <com/sun/star/ucb/XContentIdentifierFactory.hpp> @@ -132,8 +131,7 @@ public: //------------------------------------------------------------------------------ class UpdateInformationProvider : - public ::cppu::WeakImplHelper4< deployment::XUpdateInformationProvider, - ucb::XCommandEnvironment, + public ::cppu::WeakImplHelper3< deployment::XUpdateInformationProvider, ucb::XWebDAVCommandEnvironment, lang::XServiceInfo > { diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl index 2547aab74216..eda3d1487f32 100644 --- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl +++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl @@ -19,7 +19,7 @@ #ifndef __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__ #define __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__ -#include <com/sun/star/uno/XInterface.idl> +#include <com/sun/star/ucb/XCommandEnvironment.idl> #include <com/sun/star/beans/NamedValue.idl> @@ -27,12 +27,8 @@ module com { module sun { module star { module ucb { /** A command environment that can be used to deal with WebDAV/HTTP specific commands. - - <p>Supply an implementation of this interface together with an - XCommandEnvironment implementation, when executing a command - using XCommandProcessor. */ -interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface +interface XWebDAVCommandEnvironment : XCommandEnvironment { /** This method gets called while assembling an WebDAV/HTTP request. The returned headername-headervalue pairs will be appended to @@ -54,7 +50,6 @@ interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface [in] string aMethod); }; - }; }; }; }; #endif |