summaryrefslogtreecommitdiff
path: root/uui
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-07-06 13:29:36 +0000
committerRüdiger Timm <rt@openoffice.org>2007-07-06 13:29:36 +0000
commitee284d1a1b28aac9224d9cd02a37f86a13e77aec (patch)
tree0402890f27fdc58fb46ea5bdc839445edeceee06 /uui
parent8d082f42b764e2302fa70511792132443c82a091 (diff)
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)
Diffstat (limited to 'uui')
-rw-r--r--uui/source/iahndl.hxx13
1 files changed, 11 insertions, 2 deletions
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;
@@ -219,6 +220,14 @@ private:
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,
com::sun::star::uno::Sequence<