From ee284d1a1b28aac9224d9cd02a37f86a13e77aec Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Fri, 6 Jul 2007 13:29:36 +0000
Subject: INTEGRATION: CWS updchk06 (1.16.12); FILE MERGED 2007/06/15 07:08:12
 kso 1.16.12.1: #29340# - Support for NameClashResolveRequest - part 1 (not
 yet finished)

---
 uui/source/iahndl.hxx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'uui')

diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index f5ef85c6b90f..66a246623791 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: iahndl.hxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: obo $ $Date: 2007-01-23 08:09:05 $
+ *  last change: $Author: rt $ $Date: 2007-07-06 14:29:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -95,6 +95,7 @@ namespace com { namespace sun { namespace star {
     namespace ucb {
         class AuthenticationRequest;
         class HandleCookiesRequest;
+        class NameClashResolveRequest;
     }
     namespace uno {
         class RuntimeException;
@@ -218,6 +219,14 @@ private:
     rContinuations)
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
+    void
+    handleNameClashResolveRequest(
+        com::sun::star::ucb::NameClashResolveRequest const & rRequest,
+        com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
+            com::sun::star::task::XInteractionContinuation > > const &
+        rContinuations)
+        SAL_THROW((com::sun::star::uno::RuntimeException));
+
     void
     handleMasterPasswordRequest(
         com::sun::star::task::PasswordRequestMode nMode,
-- 
cgit