offapi/UnoApi_offapi.mk                                |    5 -
 offapi/com/sun/star/ucb/Cookie.idl                     |   69 ----------------
 offapi/com/sun/star/ucb/CookiePolicy.idl               |   51 -----------
 offapi/com/sun/star/ucb/CookieRequest.idl              |   47 ----------
 offapi/com/sun/star/ucb/HandleCookiesRequest.idl       |   55 ------------
 offapi/com/sun/star/ucb/XInteractionCookieHandling.idl |   73 -----------------
 offapi/type_reference/types.rdb                        |binary
 7 files changed, 300 deletions(-)

New commits:
commit 04553f43e8bf12c8ecbbfb24f87199767c34c4f4
Author: Michael Stahl <mst...@redhat.com>
Date:   Fri Nov 30 14:01:04 2012 +0100

    API CHANGE: remove com.sun.star.ucb.Cookie related API
    
    The implementation behind these types was removed in LibreOffice 3.6,
    for bug fdo#48870.
    
    com.sun.star.ucb.Cookie
    com.sun.star.ucb.CookiePolicy
    com.sun.star.ucb.CookieRequest
    com.sun.star.ucb.HandleCookiesRequest
    com.sun.star.ucb.XInteractionCookieHandling
    
    EXISTENCE: published key "/UCR/com/sun/star/ucb/CookieRequest" exists
    only in registry 1
    EXISTENCE: published key
    "/UCR/com/sun/star/ucb/XInteractionCookieHandling" exists only in
    registry 1
    EXISTENCE: published key "/UCR/com/sun/star/ucb/HandleCookiesRequest"
    exists only in registry 1
    EXISTENCE: published key "/UCR/com/sun/star/ucb/Cookie" exists only in
    registry 1
    EXISTENCE: published key "/UCR/com/sun/star/ucb/CookiePolicy" exists
    only in registry 1
    
    Change-Id: Ia7516eda8913aa721da386882543adaddbba7e2f

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 7311622..4f5af08 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3701,9 +3701,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
        ContentInfoAttribute \
        ContentProviderInfo \
        ContentResultSetCapability \
-       Cookie \
-       CookiePolicy \
-       CookieRequest \
        CrossReference \
        DocumentHeaderField \
        DocumentStoreMode \
@@ -3719,7 +3716,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
        FolderListEntry \
        GlobalTransferCommandArgument \
        GlobalTransferCommandArgument2 \
-       HandleCookiesRequest \
        IOErrorCode \
        IllegalIdentifierException \
        InsertCommandArgument \
@@ -3827,7 +3823,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
        XFetchProvider \
        XFetchProviderForContentAccess \
        XFileIdentifierConverter \
-       XInteractionCookieHandling \
        XInteractionHandlerSupplier \
        XInteractionReplaceExistingData \
        XInteractionSupplyAuthentication \
diff --git a/offapi/com/sun/star/ucb/Cookie.idl 
b/offapi/com/sun/star/ucb/Cookie.idl
deleted file mode 100644
index fd8da0d..0000000
--- a/offapi/com/sun/star/ucb/Cookie.idl
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 regarding copyright
- *   ownership. The ASF licenses this file 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 .
- */
-#ifndef __com_sun_star_ucb_Cookie_idl__
-#define __com_sun_star_ucb_Cookie_idl__
-
-#include <com/sun/star/util/DateTime.idl>
-#include <com/sun/star/ucb/CookiePolicy.idl>
-
-
-
-module com { module sun { module star { module ucb {
-
-/** A cookie.
-@deprecated
-*/
-published struct Cookie
-{
-    /** The name of the cookie.
-    */
-    string Name;
-
-    /** The value of the cookie.
-    */
-    string Value;
-
-    /** The domain to which the cookie applies.
-    */
-    string Domain;
-
-    /** The path to which the cookie applies.
-    */
-    string Path;
-
-    /** The date the cookie will expire.
-    */
-    com::sun::star::util::DateTime Expires;
-
-    /** Whether the requested action should be performed in a secure fashion.
-    */
-    boolean Secure;
-
-    /** The policy for handling this cookie in the future.
-    */
-    com::sun::star::ucb::CookiePolicy Policy;
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/ucb/CookiePolicy.idl 
b/offapi/com/sun/star/ucb/CookiePolicy.idl
deleted file mode 100644
index 6f9c2e8..0000000
--- a/offapi/com/sun/star/ucb/CookiePolicy.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 regarding copyright
- *   ownership. The ASF licenses this file 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 .
- */
-#ifndef __com_sun_star_ucb_CookiePolicy_idl__
-#define __com_sun_star_ucb_CookiePolicy_idl__
-
-
-
-module com { module sun { module star { module ucb {
-
-/** A policy how to handle cookie requests.
-
-@deprecated
-*/
-published enum CookiePolicy
-{
-    /** Interactively accept or ignore each individual cookie request.
-    */
-    CONFIRM,
-
-    /** Generally accept all cookie requests.
-    */
-    ACCEPT,
-
-    /** Generally ignore all cookie requests.
-    */
-    IGNORE
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/ucb/CookieRequest.idl 
b/offapi/com/sun/star/ucb/CookieRequest.idl
deleted file mode 100644
index 92b87c5..0000000
--- a/offapi/com/sun/star/ucb/CookieRequest.idl
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 regarding copyright
- *   ownership. The ASF licenses this file 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 .
- */
-#ifndef __com_sun_star_ucb_CookieRequest_idl__
-#define __com_sun_star_ucb_CookieRequest_idl__
-
-
-
-module com { module sun { module star { module ucb {
-
-/** Cookie requests.
-
-@deprecated
-*/
-published enum CookieRequest
-{
-    /** Receive (store) a cookie.
-    */
-    RECEIVE,
-
-    /** Send a (stored) cookie.
-    */
-    SEND
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl 
b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
deleted file mode 100644
index 3fee186..0000000
--- a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 regarding copyright
- *   ownership. The ASF licenses this file 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 .
- */
-#ifndef __com_sun_star_ucb_HandleCookiesRequest_idl__
-#define __com_sun_star_ucb_HandleCookiesRequest_idl__
-
-#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-#include <com/sun/star/ucb/Cookie.idl>
-#include <com/sun/star/ucb/CookieRequest.idl>
-
-
-
-module com { module sun { module star { module ucb {
-
-/** An error requesting guidance on how to handle cookie requests.
-
-@deprecated
-*/
-published exception HandleCookiesRequest: 
com::sun::star::task::ClassifiedInteractionRequest
-{
-    /** The URL for which one ore more cookies are requested.
-    */
-    string URL;
-
-    /** The requested cookies.
-    */
-    sequence<com::sun::star::ucb::Cookie> Cookies;
-
-    /** Whether to receive (store) or send the cookies.
-     */
-    com::sun::star::ucb::CookieRequest Request;
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl 
b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
deleted file mode 100644
index 797042d..0000000
--- a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 regarding copyright
- *   ownership. The ASF licenses this file 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 .
- */
-#ifndef __com_sun_star_ucb_XInteractionCookieHandling_idl__
-#define __com_sun_star_ucb_XInteractionCookieHandling_idl__
-
-#include <com/sun/star/task/XInteractionContinuation.idl>
-#include <com/sun/star/ucb/CookiePolicy.idl>
-#include <com/sun/star/ucb/Cookie.idl>
-
-
-
-module com { module sun { module star { module ucb {
-
-/** An interaction continuation handing back some cookie request handling
-    policy.
-
-    <p>This continuation is typically used in conjunction with
-    <type>HandleCookiesRequest</type>.
-
-       @deprecated
-*/
-published interface XInteractionCookieHandling: 
com::sun::star::task::XInteractionContinuation
-{
-    /** Set a general policy to hand back.
-
-        <p>This method should be called before select().
-
-        @param Policy
-            Some policy how to handle cookies.
-    */
-    void setGeneralPolicy( [in] com::sun::star::ucb::CookiePolicy Policy );
-
-    /** Set a policy to hand back for a specific cookie.
-
-        <p>This method should be called before select().
-
-        @param ConfirmCookie
-            A cookie that should come from the sequence of
-            cookies offered by the <type>HandleCookiesRequest</type> and that
-            should have a policy of <member>CookiePolicy::CONFIRM</member>.
-
-        @param Accept
-            If <TRUE/>, set the policy for the cookie to
-            <member>CookiePolicy::ACCEPT</member>; otherwise, set it to
-            <member>CookiePolicy::IGNORE</member>.
-    */
-    void setSpecificPolicy( [in] com::sun::star::ucb::Cookie ConfirmCookie,
-             [in] boolean Accept );
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 1190d09..7bf0a5b 100644
Binary files a/offapi/type_reference/types.rdb and 
b/offapi/type_reference/types.rdb differ
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to