diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-01-28 14:12:41 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-01-28 14:12:41 +0100 |
| commit | cce7fc0948b93019968ce8bb8f04620af05b728a (patch) | |
| tree | 75489ac3f588891157a468b1d24af49bc66636b6 /uui | |
| parent | 9e4db908b46b0c7f71f17d278cf96d59db9cddc4 (diff) | |
autorecovery: merged DocumentMacroConfirmationRequest2 into DocumentMacroConfirmationRequest - no need to have two types which are effectively the same, and both rarely used
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl.cxx | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index cc65580aec..916f217bf0 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -69,7 +69,6 @@ #include "com/sun/star/task/MasterPasswordRequest.hpp" #include "com/sun/star/task/NoMasterException.hpp" #include "com/sun/star/task/DocumentMacroConfirmationRequest.hpp" -#include "com/sun/star/task/DocumentMacroConfirmationRequest2.hpp" #include "com/sun/star/task/XInteractionAbort.hpp" #include "com/sun/star/task/XInteractionApprove.hpp" #include "com/sun/star/task/XInteractionDisapprove.hpp" @@ -1286,26 +1285,13 @@ bool UUIInteractionHelper::handleErrorHandlerRequests( handleMacroConfirmRequest( aMacroConfirmRequest.DocumentURL, aMacroConfirmRequest.DocumentStorage, - ODFVER_012_TEXT, + aMacroConfirmRequest.DocumentVersion.getLength() ? aMacroConfirmRequest.DocumentVersion : ODFVER_012_TEXT, aMacroConfirmRequest.DocumentSignatureInformation, rRequest->getContinuations() ); return true; } - star::task::DocumentMacroConfirmationRequest2 aMacroConfirmRequest2; - if (aAnyRequest >>= aMacroConfirmRequest2) - { - handleMacroConfirmRequest( - aMacroConfirmRequest2.DocumentURL, - aMacroConfirmRequest2.DocumentZipStorage, - aMacroConfirmRequest2.DocumentVersion, - aMacroConfirmRequest2.DocumentSignatureInformation, - rRequest->getContinuations() - ); - return true; - } - FutureDocumentVersionProductUpdateRequest aProductUpdateRequest; if (aAnyRequest >>= aProductUpdateRequest) { @@ -1378,10 +1364,10 @@ UUIInteractionHelper::handle_impl( OSL_ENSURE( xInitialization.is(), "Custom Interactionhandler does not implement mandatory interface XInitialization!" ); if (xInitialization.is()) { - uno::Sequence< uno::Any > propertyValues(1);
- beans::PropertyValue aProperty;
-
- aProperty.Name = rtl::OUString::createFromAscii( "Parent" );
+ uno::Sequence< uno::Any > propertyValues(1); + beans::PropertyValue aProperty; + + aProperty.Name = rtl::OUString::createFromAscii( "Parent" ); aProperty.Value <<= getParentXWindow(); propertyValues[ 0 ] <<= aProperty; |