fdo#48870: Remove cookie handling code.

15 files changed, 9 insertions, 632 deletions

diff --git a/offapi/com/sun/star/ucb/Cookie.idl b/offapi/com/sun/star/ucb/Cookie.idl
index cc8d8cc7c28c..a85493e38a26 100644
--- a/offapi/com/sun/star/ucb/Cookie.idl
+++ b/offapi/com/sun/star/ucb/Cookie.idl
@@ -38,6 +38,7 @@ module com { module sun { module star { module ucb {
 
 //=============================================================================
 /** A cookie.
+@deprecated
 */
 published struct Cookie
 {
diff --git a/offapi/com/sun/star/ucb/CookiePolicy.idl b/offapi/com/sun/star/ucb/CookiePolicy.idl
index 4c825381f5bc..3f1d1db5653b 100644
--- a/offapi/com/sun/star/ucb/CookiePolicy.idl
+++ b/offapi/com/sun/star/ucb/CookiePolicy.idl
@@ -35,6 +35,8 @@ module com { module sun { module star { module ucb {
 
 //=============================================================================
 /** A policy how to handle cookie requests.
+
+@deprecated
 */
 published enum CookiePolicy
 {
diff --git a/offapi/com/sun/star/ucb/CookieRequest.idl b/offapi/com/sun/star/ucb/CookieRequest.idl
index f6aff1ffa93f..016caa13a0f1 100644
--- a/offapi/com/sun/star/ucb/CookieRequest.idl
+++ b/offapi/com/sun/star/ucb/CookieRequest.idl
@@ -35,6 +35,8 @@ module com { module sun { module star { module ucb {
 
 //=============================================================================
 /** Cookie requests.
+
+@deprecated
 */
 published enum CookieRequest
 {
diff --git a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
index f89b7a0a9e69..bd43a3b572d9 100644
--- a/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
+++ b/offapi/com/sun/star/ucb/HandleCookiesRequest.idl
@@ -39,6 +39,8 @@ 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
 {
diff --git a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
index 66fc31467d33..368b5c3a9efb 100644
--- a/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
+++ b/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
@@ -43,6 +43,8 @@ module com { module sun { module star { module ucb {
 
     <p>This continuation is typically used in conjunction with
     <type>HandleCookiesRequest</type>.
+
+	@deprecated
 */
 published interface XInteractionCookieHandling: com::sun::star::task::XInteractionContinuation
 {
diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk
index b3fae69e959f..010a74a433d2 100644
--- a/uui/AllLangResTarget_uui.mk
+++ b/uui/AllLangResTarget_uui.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_SrsTarget_set_include,uui/res,\
 
 $(eval $(call gb_SrsTarget_add_files,uui/res,\
 	uui/source/alreadyopen.src \
-	uui/source/cookiedg.src \
 	uui/source/filechanged.src \
 	uui/source/fltdlg.src \
 	uui/source/ids.src \
diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk
index d3f2280569bf..b91002c7adb8 100644
--- a/uui/Library_uui.mk
+++ b/uui/Library_uui.mk
@@ -51,12 +51,10 @@ $(eval $(call gb_Library_use_libraries,uui,\
 
 $(eval $(call gb_Library_add_exception_objects,uui,\
 	uui/source/alreadyopen \
-	uui/source/cookiedg \
 	uui/source/filechanged \
 	uui/source/fltdlg \
 	uui/source/iahndl \
 	uui/source/iahndl-authentication \
-	uui/source/iahndl-cookies \
 	uui/source/iahndl-errorhandler \
 	uui/source/iahndl-filter \
 	uui/source/iahndl-ioexceptions \
diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx
deleted file mode 100644
index 75b15c5ed2dd..000000000000
--- a/uui/source/cookiedg.cxx
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <svl/httpcook.hxx>
-#include <tools/urlobj.hxx>
-#include <vcl/msgbox.hxx>
-
-#include <cookiedg.hrc>
-#include <cookiedg.hxx>
-#include <ids.hrc>
-
-// CookiesDialog ---------------------------------------------------------
-
-IMPL_LINK( CookiesDialog, ButtonHdl_Impl, PushButton *, pBtn )
-{
-    short nRet = ( &maSendBtn == pBtn ) ? RET_OK : RET_CANCEL;
-    EndDialog( nRet );
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-CookiesDialog::CookiesDialog( Window* pParent,
-                              CntHTTPCookieRequest* pRequest,
-                              ResMgr* pResMgr ) :
-
-    ModalDialog( pParent, ResId( DLG_COOKIES, *pResMgr ) ),
-
-    maCookieFB              ( this, ResId( FB_COOKIES, *pResMgr ) ),
-    maCookieFT              ( this, ResId( FT_COOKIES, *pResMgr ) ),
-    maInFutureLine          ( this, ResId( FL_COOKIES, *pResMgr ) ),
-    maInFutureSendBtn       ( this, ResId( RB_INFUTURE_SEND, *pResMgr ) ),
-    maInFutureIgnoreBtn     ( this, ResId( RB_INFUTURE_IGNORE, *pResMgr ) ),
-    maInFutureInteractiveBtn( this, ResId( RB_INFUTURE_INTERACTIVE, *pResMgr ) ),
-    maInFutureGB            ( this, ResId( GB_INFUTURE, *pResMgr ) ),
-    maIgnoreBtn             ( this, ResId( BTN_COOKIES_CANCEL, *pResMgr ) ),
-    maSendBtn               ( this, ResId( BTN_COOKIES_OK, *pResMgr ) ),
-
-    mpCookieRequest         ( pRequest )
-
-{
-    FreeResource();
-
-    Link aLink( LINK( this, CookiesDialog, ButtonHdl_Impl ) );
-    maIgnoreBtn.SetClickHdl( aLink );
-    maSendBtn.SetClickHdl( aLink );
-    const Bitmap& rBitmap = maCookieFB.GetBitmap();
-    Size aSize = rBitmap.GetSizePixel();
-    SetMapMode( MapMode( MAP_APPFONT ) );
-    Size aLogicSize = PixelToLogic( aSize );
-    Point aPoint( 6 ,
-                  6 + ( 145 - aLogicSize.Height() ) / 2 );
-    maCookieFB.SetPosSizePixel( LogicToPixel( aPoint ), aSize );
-    maCookieFB.Show();
-
-    sal_uInt16 nOffset = CNTHTTP_COOKIE_REQUEST_RECV == mpCookieRequest->m_eType
-        ? 0 : STR_COOKIES_SEND_START - STR_COOKIES_RECV_START;
-    INetURLObject aObj( mpCookieRequest->m_rURL );
-    SetText( String( ResId( STR_COOKIES_RECV_TITLE + nOffset, *pResMgr ) ) );
-    String aMsg( ResId( STR_COOKIES_RECV_START + nOffset, *pResMgr ) );
-    aMsg.SearchAndReplaceAscii( "${HOST}", aObj.GetHost() );
-    aMsg.SearchAndReplaceAscii( "${PATH}", aObj.GetPath() );
-    String aTemplate( ResId( STR_COOKIES_RECV_COOKIES, *pResMgr ) );
-    CntHTTPCookieList_impl& rList =mpCookieRequest->m_rCookieList;
-    String aPair, aCookie;
-
-    for ( sal_uInt16 i = (sal_uInt16)rList.size(); i--; )
-    {
-        CntHTTPCookie* pCookie = rList[ i ];
-
-        if ( CNTHTTP_COOKIE_POLICY_INTERACTIVE == pCookie->m_nPolicy )
-        {
-            aCookie = aTemplate;
-            aCookie.SearchAndReplaceAscii( "${DOMAIN}", pCookie->m_aDomain );
-            aCookie.SearchAndReplaceAscii( "${PATH}", pCookie->m_aPath );
-            aPair = pCookie->m_aName;
-            aPair += '=';
-            aPair += pCookie->m_aValue;
-            aCookie.SearchAndReplaceAscii( "${COOKIE}", aPair );
-            aMsg += aCookie;
-        }
-    }
-    maInFutureInteractiveBtn.Check( sal_True );
-    maCookieFT.SetText( aMsg );
-}
-
-// -----------------------------------------------------------------------
-
-short CookiesDialog::Execute()
-{
-    maSendBtn.GrabFocus();
-    short nRet = ModalDialog::Execute();
-    sal_uInt16 nStatus = CNTHTTP_COOKIE_POLICY_INTERACTIVE;
-
-    if ( maInFutureSendBtn.IsChecked() )
-        nStatus = CNTHTTP_COOKIE_POLICY_ACCEPTED;
-
-    if ( maInFutureIgnoreBtn.IsChecked() )
-        nStatus = CNTHTTP_COOKIE_POLICY_BANNED;
-    CntHTTPCookieList_impl& rList = mpCookieRequest->m_rCookieList;
-
-    for ( sal_uInt16 i = (sal_uInt16)rList.size(); i--; )
-    {
-        sal_uInt16& rStatus = rList[ i ]->m_nPolicy;
-
-        if ( rStatus == CNTHTTP_COOKIE_POLICY_INTERACTIVE )
-            rStatus = nStatus;
-    }
-
-    if ( nRet == RET_OK )
-        mpCookieRequest->m_nRet = CNTHTTP_COOKIE_POLICY_ACCEPTED;
-    else
-        mpCookieRequest->m_nRet = CNTHTTP_COOKIE_POLICY_BANNED;
-
-    return nRet;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/cookiedg.hrc b/uui/source/cookiedg.hrc
deleted file mode 100644
index 01d93e17de7f..000000000000
--- a/uui/source/cookiedg.hrc
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef UUI_COOKIEDG_HRC
-#define UUI_COOKIEDG_HRC
-
-//============================================================================
-#define FB_COOKIES              10
-#define FT_COOKIES              11
-#define FL_COOKIES              12
-
-#define RB_INFUTURE_SEND        20
-#define RB_INFUTURE_IGNORE      21
-#define RB_INFUTURE_INTERACTIVE 22
-#define GB_INFUTURE             23
-
-#define BTN_COOKIES_CANCEL      30
-#define BTN_COOKIES_OK          31
-
-#endif // UUI_COOKIEDG_HRC
-
diff --git a/uui/source/cookiedg.hxx b/uui/source/cookiedg.hxx
deleted file mode 100644
index 746f56bf333c..000000000000
--- a/uui/source/cookiedg.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef UUI_COOKIEDG_HXX
-#define UUI_COOKIEDG_HXX
-
-#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/group.hxx>
-
-struct CntHTTPCookieRequest;
-
-//============================================================================
-class CookiesDialog : public ModalDialog
-{
-    FixedBitmap             maCookieFB;
-    FixedText               maCookieFT;
-    FixedLine               maInFutureLine;
-    RadioButton             maInFutureSendBtn;
-    RadioButton             maInFutureIgnoreBtn;
-    RadioButton             maInFutureInteractiveBtn;
-    GroupBox                maInFutureGB;
-    PushButton              maIgnoreBtn;
-    PushButton              maSendBtn;
-
-    CntHTTPCookieRequest*   mpCookieRequest;
-
-    DECL_LINK( ButtonHdl_Impl, PushButton * );
-
-public:
-    CookiesDialog( Window* pParent, CntHTTPCookieRequest* pRequest,
-                   ResMgr* pResMgr );
-
-    virtual short Execute();
-};
-
-#endif // UUI_COOKIEDG_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/cookiedg.src b/uui/source/cookiedg.src
deleted file mode 100644
index 156da50c160c..000000000000
--- a/uui/source/cookiedg.src
+++ /dev/null
@@ -1,171 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define __RSC
-
-#ifndef UUI_COOKIEDG_HRC
-#include <cookiedg.hrc>
-#endif
-#ifndef UUI_IDS_HRC
-#include <ids.hrc>
-#endif
-
-ModalDialog DLG_COOKIES
-{
-    HelpId = HID_DLG_COOKIES ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 295 , 193 ) ;
-    Moveable = TRUE ;
-    FixedBitmap FB_COOKIES
-    {
-        Border = True ;
-        Hide = TRUE ;
-        Fixed = Bitmap
-        {
-            File = "cookie.bmp" ;
-        };
-    };
-    FixedText FT_COOKIES
-    {
-        SVLook = TRUE ;
-        WordBreak = True ;
-        Pos = MAP_APPFONT ( 65 , 6 ) ;
-        Size = MAP_APPFONT ( 224 , 145 ) ;
-    };
-    FixedLine FL_COOKIES
-    {
-        Pos = MAP_APPFONT ( 6 , 155 ) ;
-        Size = MAP_APPFONT ( 283 , 1 ) ;
-    };
-    RadioButton RB_INFUTURE_SEND
-    {
-        HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_SEND";
-        Pos = MAP_APPFONT ( 12 , 171 ) ;
-        Size = MAP_APPFONT ( 52 , 10 ) ;
-        Text [ en-US ] = "~Send" ;
-    };
-    RadioButton RB_INFUTURE_IGNORE
-    {
-        HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_IGNORE";
-        Pos = MAP_APPFONT ( 67 , 171 ) ;
-        Size = MAP_APPFONT ( 52 , 10 ) ;
-        Text [ en-US ] = "I~gnore" ;
-    };
-    RadioButton RB_INFUTURE_INTERACTIVE
-    {
-        HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_INTERACTIVE";
-        Pos = MAP_APPFONT ( 122 , 171 ) ;
-        Size = MAP_APPFONT ( 52 , 10 ) ;
-        Text [ en-US ] = "I~nteractive" ;
-    };
-    //TODO! If this dialog is ever used again (and it should definitely be
-    // redesigned then!), get rid of the following group box (see #88883#):
-    GroupBox GB_INFUTURE
-    {
-        Pos = MAP_APPFONT ( 6 , 160 ) ;
-        Size = MAP_APPFONT ( 174 , 27 ) ;
-        Text [ en-US ] = "Future Cookie Handling" ;
-    };
-    PushButton BTN_COOKIES_CANCEL
-    {
-        HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_CANCEL";
-        Pos = MAP_APPFONT ( 186 , 173 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Ignore" ;
-    };
-    PushButton BTN_COOKIES_OK
-    {
-        HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_OK";
-        Pos = MAP_APPFONT ( 239 , 173 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-        Text [ en-US ] = "~Send" ;
-    };
-};
-
-String STR_COOKIES_RECV_START
-{
-    Text [ en-US ] = "The '${HOST}' server wishes to set one or more cookies.\nCookies contain information referring to certain URL classes. If %PRODUCTNAME later requests a document with a URL corresponding to the class of a previously set cookie, %PRODUCTNAME will send this information to the server. This allows a server to recognize the status of a WWW application, e.g., when shopping online.\n\nThe following Cookies should be set:\n\n" ;
-};
-
-String STR_COOKIES_RECV_COOKIES
-{
-    Text [ en-US ] = "Domain: ${DOMAIN}, Path: ${PATH}, Cookie: ${COOKIE}.\n" ;
-};
-
-String STR_COOKIES_RECV_TITLE
-{
-    Text [ en-US ] = "Cookie Reception" ;
-};
-
-String STR_COOKIES_SEND_START
-{
-    Text [ en-US ] = "%PRODUCTNAME has saved cookies for the server '${HOST}' which will be sent when requesting the document ${PATH}.\nCookies contain information which refers to certain URL classes. They are sent by some servers to %PRODUCTNAME where they are saved when certain documents are accessed. If %PRODUCTNAME loads a document that, according to the URL, corresponds to a class of one of the previously received Cookies, %PRODUCTNAME will send this information to that server. This enables a server to keep track of the status of a WWW application, e.g., when shopping online.\n\nThe following Cookies should be set:\n\n" ;
-};
-
-String STR_COOKIES_SEND_COOKIES
-{
-    Text [ en-US ] = "Domain: ${DOMAIN}, Path: ${PATH}, Cookie: ${COOKIE}.\n" ;
-};
-
-String STR_COOKIES_SEND_TITLE
-{
-    Text [ en-US ] = "Send Cookies" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/uui/source/iahndl-cookies.cxx b/uui/source/iahndl-cookies.cxx
deleted file mode 100644
index 6bfeb8be2258..000000000000
--- a/uui/source/iahndl-cookies.cxx
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "com/sun/star/ucb/HandleCookiesRequest.hpp"
-#include "com/sun/star/ucb/XInteractionCookieHandling.hpp"
-#include "com/sun/star/task/XInteractionRequest.hpp"
-
-#include "osl/mutex.hxx"
-#include "svl/httpcook.hxx"
-#include "vcl/svapp.hxx"
-
-#include "cookiedg.hxx"
-
-#include "iahndl.hxx"
-
-using namespace com::sun::star;
-
-namespace {
-
-void
-executeCookieDialog(Window * pParent, CntHTTPCookieRequest & rRequest)
-    SAL_THROW((uno::RuntimeException))
-{
-    try
-    {
-        SolarMutexGuard aGuard;
-
-        std::auto_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
-        std::auto_ptr< CookiesDialog > xDialog(
-            new CookiesDialog(pParent, &rRequest, xManager.get()));
-        xDialog->Execute();
-    }
-    catch (std::bad_alloc const &)
-    {
-        throw uno::RuntimeException(
-                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out of memory")),
-                  uno::Reference< uno::XInterface>());
-    }
-}
-
-void
-handleCookiesRequest_(
-    Window * pParent,
-    ucb::HandleCookiesRequest const & rRequest,
-    uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
-        rContinuations)
-    SAL_THROW((uno::RuntimeException))
-{
-    CntHTTPCookieList_impl aCookies;
-    for (sal_Int32 i = 0; i < rRequest.Cookies.getLength(); ++i)
-    {
-        try
-        {
-            std::auto_ptr< CntHTTPCookie > xCookie(new CntHTTPCookie);
-            xCookie->m_aName = UniString(rRequest.Cookies[i].Name);
-            xCookie->m_aValue = UniString(rRequest.Cookies[i].Value);
-            xCookie->m_aDomain = UniString(rRequest.Cookies[i].Domain);
-            xCookie->m_aPath = UniString(rRequest.Cookies[i].Path);
-            xCookie->m_aExpires
-                = DateTime(Date(rRequest.Cookies[i].Expires.Day,
-                                rRequest.Cookies[i].Expires.Month,
-                                rRequest.Cookies[i].Expires.Year),
-                           Time(rRequest.Cookies[i].Expires.Hours,
-                                rRequest.Cookies[i].Expires.Minutes,
-                                rRequest.Cookies[i].Expires.Seconds,
-                                rRequest.Cookies[i].Expires.HundredthSeconds));
-            xCookie->m_nFlags
-                = rRequest.Cookies[i].Secure ? CNTHTTP_COOKIE_FLAG_SECURE : 0;
-            switch (rRequest.Cookies[i].Policy)
-            {
-            case ucb::CookiePolicy_CONFIRM:
-                xCookie->m_nPolicy = CNTHTTP_COOKIE_POLICY_INTERACTIVE;
-                break;
-
-            case ucb::CookiePolicy_ACCEPT:
-                xCookie->m_nPolicy = CNTHTTP_COOKIE_POLICY_ACCEPTED;
-                break;
-
-            case ucb::CookiePolicy_IGNORE:
-                xCookie->m_nPolicy = CNTHTTP_COOKIE_POLICY_BANNED;
-                break;
-
-            default:
-                OSL_ASSERT(false);
-                break;
-            }
-            aCookies.push_back( xCookie.get() );
-            xCookie.release();
-        }
-        catch (std::bad_alloc const &)
-        {
-            throw uno::RuntimeException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                  "out of memory")),
-                uno::Reference< uno::XInterface >());
-        }
-    }
-
-    CntHTTPCookieRequest
-    aRequest(rRequest.URL,
-                 aCookies,
-                 rRequest.Request == ucb::CookieRequest_RECEIVE
-                     ? CNTHTTP_COOKIE_REQUEST_RECV
-                     : CNTHTTP_COOKIE_REQUEST_SEND);
-    executeCookieDialog(pParent, aRequest);
-    for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i)
-    {
-        uno::Reference< ucb::XInteractionCookieHandling >
-            xCookieHandling(rContinuations[i], uno::UNO_QUERY);
-        if (xCookieHandling.is())
-        {
-            switch (aRequest.m_nRet)
-            {
-            case CNTHTTP_COOKIE_POLICY_INTERACTIVE:
-                xCookieHandling->
-                    setGeneralPolicy(ucb::CookiePolicy_CONFIRM);
-                break;
-
-            case CNTHTTP_COOKIE_POLICY_ACCEPTED:
-                xCookieHandling->
-                    setGeneralPolicy(ucb::CookiePolicy_ACCEPT);
-                break;
-
-            case CNTHTTP_COOKIE_POLICY_BANNED:
-                xCookieHandling->
-                    setGeneralPolicy(ucb::CookiePolicy_IGNORE);
-                break;
-            }
-            for (sal_Int32 j = 0; j < rRequest.Cookies.getLength(); ++j)
-                if (rRequest.Cookies[j].Policy
-                    == ucb::CookiePolicy_CONFIRM)
-                    switch ( (aCookies)[ j ]->m_nPolicy )
-                    {
-                    case CNTHTTP_COOKIE_POLICY_ACCEPTED:
-                        xCookieHandling->
-                            setSpecificPolicy(rRequest.Cookies[j], true);
-                        break;
-
-                    case CNTHTTP_COOKIE_POLICY_BANNED:
-                        xCookieHandling->
-                            setSpecificPolicy(rRequest.Cookies[j], false);
-                        break;
-                    }
-            xCookieHandling->select();
-            break;
-        }
-    }
-}
-
-} // namespace
-
-bool
-UUIInteractionHelper::handleCookiesRequest(
-    uno::Reference< task::XInteractionRequest > const & rRequest)
-    SAL_THROW((uno::RuntimeException))
-{
-    uno::Any aAnyRequest(rRequest->getRequest());
-
-    ucb::HandleCookiesRequest aCookiesRequest;
-    if (aAnyRequest >>= aCookiesRequest)
-    {
-        handleCookiesRequest_(getParentProperty(),
-                              aCookiesRequest,
-                              rRequest->getContinuations());
-        return true;
-    }
-    return false;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 4011f6a16324..2406b40b9821 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -895,9 +895,6 @@ UUIInteractionHelper::handleRequest_impl(
             if ( handlePasswordRequest( rRequest ) )
                 return true;
 
-            if ( handleCookiesRequest( rRequest ) )
-                return true;
-
             if ( handleNoSuchFilterRequest( rRequest ) )
                 return true;
 
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 5f0fd4fb0596..df1edde33291 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -238,12 +238,6 @@ private:
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
     bool
-    handleCookiesRequest(
-        com::sun::star::uno::Reference<
-            com::sun::star::task::XInteractionRequest > const & rRequest)
-        SAL_THROW((com::sun::star::uno::RuntimeException));
-
-    bool
     handleNoSuchFilterRequest(
         com::sun::star::uno::Reference<
             com::sun::star::task::XInteractionRequest > const & rRequest)
diff --git a/uui/util/uui.xml b/uui/util/uui.xml
index d5a2537a5379..f622c0bfb111 100755
--- a/uui/util/uui.xml
+++ b/uui/util/uui.xml
@@ -57,7 +57,6 @@
     <type>com.sun.star.task.XInteractionRetry</type>
     <type>com.sun.star.task.XPasswordContainer</type>
     <type>com.sun.star.ucb.AuthenticationRequest</type>
-    <type>com.sun.star.ucb.HandleCookiesRequest</type>
     <type>com.sun.star.ucb.InteractiveAugmentedIOException</type>
     <type>com.sun.star.ucb.InteractiveCHAOSException</type>
     <type>com.sun.star.ucb.InteractiveNetworkConnectException</type>
@@ -68,7 +67,6 @@
     <type>com.sun.star.ucb.InteractiveNetworkResolveNameException</type>
     <type>com.sun.star.ucb.InteractiveNetworkWriteException</type>
     <type>com.sun.star.ucb.InteractiveWrongMediumException</type>
-    <type>com.sun.star.ucb.XInteractionCookieHandling</type>
     <type>com.sun.star.ucb.XInteractionSupplyAuthentication</type>
     <type>com.sun.star.uno.Exception</type>
     <type>com.sun.star.uno.RuntimeException</type>