From 34e224f6783d92e0a75d070a0e5b5fa65822462b Mon Sep 17 00:00:00 2001 From: Dirk Völzke Date: Mon, 23 Nov 2009 13:51:12 +0000 Subject: #i106373# Removed unused code --- uui/source/iahndl.cxx | 3 +++ uui/source/iahndl.hxx | 3 +++ 2 files changed, 6 insertions(+) (limited to 'uui') diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 996fd24e531d..4fbbb7f75c26 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -2630,6 +2630,8 @@ UUIInteractionHelper::handleCertificateValidationRequest( */ } +// @@@ Todo #i29340#: activate! +#if 0 namespace { enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE }; @@ -2729,6 +2731,7 @@ UUIInteractionHelper::handleNameClashResolveRequest( break; } } +#endif void UUIInteractionHelper::handleMasterPasswordRequest( diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index bea53e436c6d..6c16769406c5 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -267,6 +267,8 @@ private: rContinuations) SAL_THROW((com::sun::star::uno::RuntimeException)); +// @@@ Todo #i29340#: activate! +#if 0 void handleNameClashResolveRequest( com::sun::star::ucb::NameClashResolveRequest const & rRequest, @@ -274,6 +276,7 @@ private: com::sun::star::task::XInteractionContinuation > > const & rContinuations) SAL_THROW((com::sun::star::uno::RuntimeException)); +#endif void handleMasterPasswordRequest( -- cgit From d30937f3ef1f1c8c2f38d0923ab30607c0aceb7f Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 9 Apr 2010 11:05:09 +0200 Subject: slidecopy: separate resource ID number circles for svl and svtools (thanks to MBA for the patch) --- uui/source/iahndl-errorhandler.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uui') diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index ed8fd2118184..6e385372339c 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -40,7 +40,7 @@ #include "com/sun/star/task/XInteractionRetry.hpp" #include "tools/errinf.hxx" // ErrorHandler, ErrorContext, ... -#include "svl/svtools.hrc" // RID_ERRHDL +#include "svtools/svtools.hrc" // RID_ERRHDL #include "ids.hrc" #include "getcontinuations.hxx" -- cgit From 6ebe363ce2eb75b496deb153fe00e7ce2a753b6a Mon Sep 17 00:00:00 2001 From: Dirk Voelzke Date: Tue, 27 Apr 2010 12:03:43 +0200 Subject: dv12#i29340# activated handleNameClashResolveRequest --- uui/source/iahndl.cxx | 15 +++++++-------- uui/source/iahndl.hxx | 3 --- 2 files changed, 7 insertions(+), 11 deletions(-) mode change 100644 => 100755 uui/source/iahndl.hxx (limited to 'uui') 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 old mode 100644 new mode 100755 index 42935565a314..6402653d3bda --- 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( -- cgit From ececcc290b431ca40b785afbffa1f3c2396a1bbb Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 28 Apr 2010 14:22:16 +0200 Subject: pdfextfix03: #i110871# PasswordRequest should still be supported for backwards compatibility --- uui/source/iahndl-authentication.cxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'uui') diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index f31397f1ef92..db6437322e0a 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -581,5 +581,17 @@ UUIInteractionHelper::handlePasswordRequest( true /* bool bMSCryptoMode */); return true; } + + task::PasswordRequest aPasswordRequest; + if( aAnyRequest >>= aPasswordRequest ) + { + handlePasswordRequest_(getParentProperty(), + aPasswordRequest.Mode, + rRequest->getContinuations(), + rtl::OUString(), + false /* bool bMSCryptoMode */); + return true; + } + return false; } -- cgit From bd883027c74030e4bc4f038bdcab091723246360 Mon Sep 17 00:00:00 2001 From: Dirk Voelzke Date: Thu, 6 May 2010 11:04:08 +0200 Subject: dv12#i106373# applied patch to remove unused code --- uui/source/iahndl.cxx | 11 +++++++++-- uui/source/iahndl.hxx | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'uui') diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 905faab4051a..0879e3574da3 100755 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -867,6 +867,8 @@ UUIInteractionHelper::handleRequest_impl( if ( handleCertificateValidationRequest( rRequest ) ) return true; +// @@@ Todo #i29340#: activate! +#if 0 ucb::NameClashResolveRequest aNameClashResolveRequest; if (aAnyRequest >>= aNameClashResolveRequest) { @@ -874,7 +876,7 @@ UUIInteractionHelper::handleRequest_impl( rRequest->getContinuations()); return true; } - +#endif if ( handleMasterPasswordRequest( rRequest ) ) return true; @@ -1186,6 +1188,8 @@ executeMessageBox( return aResult; } +// @@@ Todo #i29340#: activate! +#if 0 enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE }; NameClashResolveDialogResult @@ -1213,9 +1217,11 @@ executeSimpleNameClashResolveDialog( "executeSimpleNameClashResolveDialog not yet implemented!" ); return ABORT; } - +#endif } // namespace +// @@@ Todo #i29340#: activate! +#if 0 void UUIInteractionHelper::handleNameClashResolveRequest( ucb::NameClashResolveRequest const & rRequest, @@ -1283,6 +1289,7 @@ UUIInteractionHelper::handleNameClashResolveRequest( break; } } +#endif void UUIInteractionHelper::handleGenericErrorRequest( diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 6402653d3bda..581099462845 100755 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -215,6 +215,8 @@ 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, @@ -223,6 +225,7 @@ private: com::sun::star::task::XInteractionContinuation > > const & rContinuations) SAL_THROW((com::sun::star::uno::RuntimeException)); +#endif bool handleMasterPasswordRequest( -- cgit