You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2013/03/24 14:22:31 UTC
svn commit: r1460361 - in /openoffice/trunk/main:
extensions/source/update/feed/updatefeed.cxx
offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
offapi/type_reference/typelibrary_history.txt offapi/type_reference/types.rdb
Author: arielch
Date: Sun Mar 24 13:22:31 2013
New Revision: 1460361
URL: http://svn.apache.org/r1460361
Log:
i121944 - Implement inheritance in css::ucb::XWebDAVCommandEnvironment
It should be derived from css::ucb::XCommandEnvironment
Modified:
openoffice/trunk/main/extensions/source/update/feed/updatefeed.cxx
openoffice/trunk/main/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt
openoffice/trunk/main/offapi/type_reference/types.rdb
Modified: openoffice/trunk/main/extensions/source/update/feed/updatefeed.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/update/feed/updatefeed.cxx?rev=1460361&r1=1460360&r2=1460361&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/update/feed/updatefeed.cxx (original)
+++ openoffice/trunk/main/extensions/source/update/feed/updatefeed.cxx Sun Mar 24 13:22:31 2013
@@ -25,7 +25,7 @@
#include "precompiled_extensions.hxx"
#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/XPropertySetInfo.hpp>
@@ -37,7 +37,6 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XServiceInfo.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>
@@ -137,8 +136,7 @@ public:
//------------------------------------------------------------------------------
class UpdateInformationProvider :
- public ::cppu::WeakImplHelper4< deployment::XUpdateInformationProvider,
- ucb::XCommandEnvironment,
+ public ::cppu::WeakImplHelper3< deployment::XUpdateInformationProvider,
ucb::XWebDAVCommandEnvironment,
lang::XServiceInfo >
{
Modified: openoffice/trunk/main/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl?rev=1460361&r1=1460360&r2=1460361&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl Sun Mar 24 13:22:31 2013
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,44 +7,31 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#ifndef __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__
#define __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/ucb/XCommandEnvironment.idl>
#include <com/sun/star/beans/NamedValue.idl>
-#endif
-
-//=============================================================================
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
- <type>XCommandEnvironment</type> implementation, when executing a command
- using <type>XCommandProcessor</type>.
*/
-published interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface
+published interface XWebDAVCommandEnvironment : XCommandEnvironment
{
- //-------------------------------------------------------------------------
/** This method gets called while assembling an WebDAV/HTTP request.
The returned headername-headervalue pairs will be appended to
the list of request headers before the request is dispatched.
@@ -65,8 +52,6 @@ published interface XWebDAVCommandEnviro
[in] string aMethod);
};
-//=============================================================================
-
}; }; }; };
#endif
Modified: openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt?rev=1460361&r1=1460360&r2=1460361&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt (original)
+++ openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt Sun Mar 24 13:22:31 2013
@@ -198,3 +198,7 @@
19/12/2012 (arielch): TaskID=121514
Remove deprecated AWT UnoControlSimpleAnimation API
+
+23/03/2013 (arielch): TaskID=121944
+ css::ucb::XWebDAVCommandEnvironment should be derived from css::ucb::XCommandEnvironment
+
Modified: openoffice/trunk/main/offapi/type_reference/types.rdb
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/type_reference/types.rdb?rev=1460361&r1=1460360&r2=1460361&view=diff
==============================================================================
Binary files - no diff available.