diff options
| author | Dirk Voelzke <dv@openoffice.org> | 2010-04-27 12:03:43 +0200 |
|---|---|---|
| committer | Dirk Voelzke <dv@openoffice.org> | 2010-04-27 12:03:43 +0200 |
| commit | 6ebe363ce2eb75b496deb153fe00e7ce2a753b6a (patch) | |
| tree | 4c608063bdeabef95cfe04984a7e3b8f031d6617 /uui | |
| parent | 5622ede8d3c7bf4bf10d9240ea742fc127904ebd (diff) | |
dv12#i29340# activated handleNameClashResolveRequest
Diffstat (limited to 'uui')
| -rwxr-xr-x | uui/source/iahndl.cxx | 15 | ||||
| -rwxr-xr-x[-rw-r--r--] | uui/source/iahndl.hxx | 3 |
2 files changed, 7 insertions, 11 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index e883bd60848d..905faab4051a 100755 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -867,14 +867,13 @@ UUIInteractionHelper::handleRequest_impl( if ( handleCertificateValidationRequest( rRequest ) ) return true; -// @@@ Todo #i29340#: activate! -// ucb::NameClashResolveRequest aNameClashResolveRequest; -// if (aAnyRequest >>= aNameClashResolveRequest) -// { -// handleNameClashResolveRequest(aNameClashResolveRequest, -// rRequest->getContinuations()); -// return true; -// } + ucb::NameClashResolveRequest aNameClashResolveRequest; + if (aAnyRequest >>= aNameClashResolveRequest) + { + handleNameClashResolveRequest(aNameClashResolveRequest, + rRequest->getContinuations()); + return true; + } if ( handleMasterPasswordRequest( rRequest ) ) return true; diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 42935565a314..6402653d3bda 100644..100755 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -215,8 +215,6 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); -// @@@ Todo #i29340#: activate! -#if 0 void handleNameClashResolveRequest( com::sun::star::ucb::NameClashResolveRequest const & rRequest, @@ -261,7 +259,6 @@ private: com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); -#endif void handleErrorHandlerRequest( |