[ooo-build-commit] Branch 'ooo/master' - 2 commits - offapi/com

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Sep 17 20:01:34 PDT 2009


 offapi/com/sun/star/embed/Storage.idl                          |   13 
 offapi/com/sun/star/security/DocumentSignatureInformation.idl  |   19 
 offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl |   83 +++
 offapi/com/sun/star/task/makefile.mk                           |    4 
 offapi/com/sun/star/ucb/makefile.mk                            |  230 +++++-----
 5 files changed, 234 insertions(+), 115 deletions(-)

New commits:
commit a544bff796b7ac67172086d60262e57ff9a7832b
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Thu Sep 17 14:41:33 2009 +0000

    CWS-TOOLING: integrate CWS kso32fixes2
    2009-09-14 kso #i104767# - 64 bit build breaker
    2009-09-14 kso #i14767# - compiler warning
    2009-09-08 kso i104767# - Removed obsolete header.
    2009-09-08 kso i104767# - Removed obsolete header include.
    2009-09-08 kso #i104767# - Fixed build breaker.
    2009-09-07 kso #i104767# - merged in dev300 m57.
    2009-09-07 kso #i104767# - support for system credentials usage
    2009-09-07 kso #i104767# - support for system credentials usage
    2009-09-07 kso #i104767# - support for system credentials usage
    2009-09-07 kso #i104767# - support for system credentials usage
    2009-09-07 kso #i104767# - support for system credentials usage
    2009-09-07 Kai Sommerfeld #i104767# - support for system credentials usage
    2009-09-07 Kai Sommerfeld #i104767# - support for system credentials usage
    2009-09-07 ks93798 #i104767# - adaptions for NTLM SSO

diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
index 5b82671..dc54f6f 100644
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
@@ -80,7 +80,8 @@ IDLFILES=\
     XStatusIndicatorSupplier.idl\
     XAbortChannel.idl\
     XInteractionRequestStringResolver.idl\
-    InteractionRequestStringResolver.idl
+    InteractionRequestStringResolver.idl\
+    XUrlContainer.idl
 
 # ------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/ucb/makefile.mk b/offapi/com/sun/star/ucb/makefile.mk
index 2cf5394..19320b7 100644
--- a/offapi/com/sun/star/ucb/makefile.mk
+++ b/offapi/com/sun/star/ucb/makefile.mk
@@ -45,6 +45,7 @@ IDLFILES=\
     AlreadyInitializedException.idl\
     AnyCompareFactory.idl\
     AuthenticationRequest.idl\
+    URLAuthenticationRequest.idl\
     CachedContentResultSet.idl\
     CachedContentResultSetFactory.idl\
     CachedContentResultSetStub.idl\
@@ -99,7 +100,7 @@ IDLFILES=\
     FTPContent.idl\
     FTPContentProvider.idl\
     GlobalTransferCommandArgument.idl\
-        GIOContentProvider.idl\
+    GIOContentProvider.idl\
     GnomeVFSContentProvider.idl\
     GnomeVFSDocumentContent.idl\
     GnomeVFSFolderContent.idl\
@@ -142,125 +143,126 @@ IDLFILES=\
     LockType.idl\
     MissingInputStreamException.idl\
     MissingPropertiesException.idl\
-     NameClash.idl\
-     NameClashException.idl\
-     NameClashResolveRequest.idl\
-     NumberedSortingInfo.idl\
-     ODMAContent.idl\
-     ODMAContentProvider.idl\
-     OpenCommandArgument.idl\
-     OpenCommandArgument2.idl\
-     OpenMode.idl\
-     OutgoingMessageState.idl\
-     PackageContentProvider.idl\
-     PackageFolderContent.idl\
-     PackageStreamContent.idl\
-     PersistentPropertySet.idl\
-     PostCommandArgument.idl\
-     PostCommandArgument2.idl\
-     Priority.idl\
-     PropertiesManager.idl\
-     PropertySetRegistry.idl\
-     PropertyValueInfo.idl\
-     PropertyValueState.idl\
-     RecipientInfo.idl\
-     RememberAuthentication.idl\
-     RemoteAccessContentProvider.idl\
-     RemoteContentProviderAcceptor.idl\
-     RemoteContentProviderChangeAction.idl\
-     RemoteContentProviderChangeEvent.idl\
-     RemoteProxyContentProvider.idl\
-     ResultSetException.idl\
+    NameClash.idl\
+    NameClashException.idl\
+    NameClashResolveRequest.idl\
+    NumberedSortingInfo.idl\
+    ODMAContent.idl\
+    ODMAContentProvider.idl\
+    OpenCommandArgument.idl\
+    OpenCommandArgument2.idl\
+    OpenMode.idl\
+    OutgoingMessageState.idl\
+    PackageContentProvider.idl\
+    PackageFolderContent.idl\
+    PackageStreamContent.idl\
+    PersistentPropertySet.idl\
+    PostCommandArgument.idl\
+    PostCommandArgument2.idl\
+    Priority.idl\
+    PropertiesManager.idl\
+    PropertySetRegistry.idl\
+    PropertyValueInfo.idl\
+    PropertyValueState.idl\
+    RecipientInfo.idl\
+    RememberAuthentication.idl\
+    RemoteAccessContentProvider.idl\
+    RemoteContentProviderAcceptor.idl\
+    RemoteContentProviderChangeAction.idl\
+    RemoteContentProviderChangeEvent.idl\
+    RemoteProxyContentProvider.idl\
+    ResultSetException.idl\
     Rule.idl\
-     RuleAction.idl\
-     RuleOperator.idl\
-     RuleSet.idl\
-     RuleTerm.idl\
-     SearchCommandArgument.idl\
-     SearchCriterium.idl\
-     SearchInfo.idl\
-     SearchRecursion.idl\
-     SendInfo.idl\
-     SendMediaTypes.idl\
-     ServiceNotFoundException.idl\
-     SimpleFileAccess.idl\
-     SortedDynamicResultSetFactory.idl\
-     SortingInfo.idl\
-     Store.idl\
-     SynchronizePolicy.idl\
-     TransferCommandOperation.idl\
-     TransferInfo.idl\
-     TransferResult.idl\
+    RuleAction.idl\
+    RuleOperator.idl\
+    RuleSet.idl\
+    RuleTerm.idl\
+    SearchCommandArgument.idl\
+    SearchCriterium.idl\
+    SearchInfo.idl\
+    SearchRecursion.idl\
+    SendInfo.idl\
+    SendMediaTypes.idl\
+    ServiceNotFoundException.idl\
+    SimpleFileAccess.idl\
+    SortedDynamicResultSetFactory.idl\
+    SortingInfo.idl\
+    Store.idl\
+    SynchronizePolicy.idl\
+    TransferCommandOperation.idl\
+    TransferInfo.idl\
+    TransferResult.idl\
     TransientDocumentsContentProvider.idl\
     TransientDocumentsRootContent.idl\
     TransientDocumentsDocumentContent.idl\
     TransientDocumentsFolderContent.idl\
     TransientDocumentsStreamContent.idl\
-     UniversalContentBroker.idl\
-     UnsupportedCommandException.idl\
-     UnsupportedDataSinkException.idl\
-     UnsupportedNameClashException.idl\
-     UnsupportedOpenModeException.idl\
-     VerificationMode.idl\
-     WebDAVContentProvider.idl\
-     WebDAVDocumentContent.idl\
-     WebDAVFolderContent.idl\
-     WelcomeDynamicResultSetStruct.idl\
-     XAnyCompare.idl\
-     XAnyCompareFactory.idl\
-     XCachedContentResultSetFactory.idl\
-     XCachedContentResultSetStubFactory.idl\
-     XCachedDynamicResultSetFactory.idl\
-     XCachedDynamicResultSetStubFactory.idl\
-     XCommandEnvironment.idl\
-     XCommandInfo.idl\
-     XCommandInfoChangeListener.idl\
-     XCommandInfoChangeNotifier.idl\
-     XCommandProcessor.idl\
-     XCommandProcessor2.idl\
-     XContent.idl\
-     XContentAccess.idl\
-     XContentCreator.idl\
-     XContentEventListener.idl\
-     XContentIdentifier.idl\
-     XContentIdentifierFactory.idl\
-     XContentIdentifierMapping.idl\
-     XContentProvider.idl\
-     XContentProviderFactory.idl\
-     XContentProviderManager.idl\
-     XContentProviderSupplier.idl\
-     XContentTransmitter.idl\
-     XDataContainer.idl\
-     XDynamicResultSet.idl\
-     XDynamicResultSetListener.idl\
-     XFetchProvider.idl\
-     XFetchProviderForContentAccess.idl\
-     XFileIdentifierConverter.idl\
-     XInteractionCookieHandling.idl\
-     XInteractionHandlerSupplier.idl\
-     XInteractionReplaceExistingData.idl\
-     XInteractionSupplyAuthentication.idl\
-     XInteractionSupplyName.idl\
-     XParameterizedContentProvider.idl\
-     XPersistentPropertySet.idl\
-     XProgressHandler.idl\
-     XPropertyMatcher.idl\
-     XPropertyMatcherFactory.idl\
-     XPropertySetRegistry.idl\
-     XPropertySetRegistryFactory.idl\
-     XRecycler.idl\
-     XRemoteContentProviderAcceptor.idl\
-     XRemoteContentProviderActivator.idl\
-     XRemoteContentProviderChangeListener.idl\
-     XRemoteContentProviderChangeNotifier.idl\
-     XRemoteContentProviderConnectionControl.idl\
-     XRemoteContentProviderDistributor.idl\
-     XRemoteContentProviderDoneListener.idl\
-     XRemoteContentProviderSupplier.idl\
-     XSimpleFileAccess.idl\
-     XSimpleFileAccess2.idl\
-     XSimpleFileAccess3.idl\
-     XSortedDynamicResultSetFactory.idl\
+    UniversalContentBroker.idl\
+    UnsupportedCommandException.idl\
+    UnsupportedDataSinkException.idl\
+    UnsupportedNameClashException.idl\
+    UnsupportedOpenModeException.idl\
+    VerificationMode.idl\
+    WebDAVContentProvider.idl\
+    WebDAVDocumentContent.idl\
+    WebDAVFolderContent.idl\
+    WelcomeDynamicResultSetStruct.idl\
+    XAnyCompare.idl\
+    XAnyCompareFactory.idl\
+    XCachedContentResultSetFactory.idl\
+    XCachedContentResultSetStubFactory.idl\
+    XCachedDynamicResultSetFactory.idl\
+    XCachedDynamicResultSetStubFactory.idl\
+    XCommandEnvironment.idl\
+    XCommandInfo.idl\
+    XCommandInfoChangeListener.idl\
+    XCommandInfoChangeNotifier.idl\
+    XCommandProcessor.idl\
+    XCommandProcessor2.idl\
+    XContent.idl\
+    XContentAccess.idl\
+    XContentCreator.idl\
+    XContentEventListener.idl\
+    XContentIdentifier.idl\
+    XContentIdentifierFactory.idl\
+    XContentIdentifierMapping.idl\
+    XContentProvider.idl\
+    XContentProviderFactory.idl\
+    XContentProviderManager.idl\
+    XContentProviderSupplier.idl\
+    XContentTransmitter.idl\
+    XDataContainer.idl\
+    XDynamicResultSet.idl\
+    XDynamicResultSetListener.idl\
+    XFetchProvider.idl\
+    XFetchProviderForContentAccess.idl\
+    XFileIdentifierConverter.idl\
+    XInteractionCookieHandling.idl\
+    XInteractionHandlerSupplier.idl\
+    XInteractionReplaceExistingData.idl\
+    XInteractionSupplyAuthentication.idl\
+    XInteractionSupplyAuthentication2.idl\
+    XInteractionSupplyName.idl\
+    XParameterizedContentProvider.idl\
+    XPersistentPropertySet.idl\
+    XProgressHandler.idl\
+    XPropertyMatcher.idl\
+    XPropertyMatcherFactory.idl\
+    XPropertySetRegistry.idl\
+    XPropertySetRegistryFactory.idl\
+    XRecycler.idl\
+    XRemoteContentProviderAcceptor.idl\
+    XRemoteContentProviderActivator.idl\
+    XRemoteContentProviderChangeListener.idl\
+    XRemoteContentProviderChangeNotifier.idl\
+    XRemoteContentProviderConnectionControl.idl\
+    XRemoteContentProviderDistributor.idl\
+    XRemoteContentProviderDoneListener.idl\
+    XRemoteContentProviderSupplier.idl\
+    XSimpleFileAccess.idl\
+    XSimpleFileAccess2.idl\
+    XSimpleFileAccess3.idl\
+    XSortedDynamicResultSetFactory.idl\
     XSourceInitialization.idl\
     XWebDAVCommandEnvironment.idl \
     CertificateValidationRequest.idl
commit 68c4890ff3e42115de19063871151208a968dd07
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Thu Sep 17 13:53:54 2009 +0000

    CWS-TOOLING: integrate CWS encsig09
    2009-09-14 15:11:29 +0200 oc  r276125 : #i105049# MacroSignatur needs Macro
    2009-09-09 17:09:46 +0200 jl  r276005 : #i103989# could not signe encrypted doc containing a formular object
    2009-09-09 13:11:24 +0200 jl  r275985 : #i103989# could not signe encrypted doc containing a formular object
    2009-09-08 15:54:02 +0200 mav  r275934 : #i103906# fix the automation test scenario ( tempfile should be writable for the user )
    2009-09-07 14:01:39 +0200 mav  r275895 : #i103906# fix the problem with reload
    2009-09-07 09:34:48 +0200 mav  r275871 : #i104786# do the ODF version check only for ODF documents
    2009-09-07 08:19:06 +0200 mav  r275870 : #i104389# fix text
    2009-09-06 22:24:21 +0200 mav  r275867 : #i104786# check the consistency of ODF version
    2009-09-06 22:23:24 +0200 mav  r275866 : #i104786# check the consistency of ODF version
    2009-09-06 22:23:00 +0200 mav  r275865 : #i104786# check the consistency of ODF version
    2009-09-06 22:22:36 +0200 mav  r275864 : #i104786# check the consistency of ODF version
    2009-09-06 22:22:03 +0200 mav  r275863 : #i104786# check the consistency of ODF version
    2009-09-02 17:09:30 +0200 mav  r275722 : #i104715# let repairing mechanics use the streams correctly
    2009-09-01 16:52:49 +0200 mav  r275670 : #i104389# notify user not to trust the corrupted document
    2009-09-01 16:31:37 +0200 mav  r275668 : #i104389# use vnd.sun.star.zip: protocol to access zip files
    2009-09-01 16:30:32 +0200 mav  r275667 : #i104389# use vnd.sun.star.zip: protocol to access zip files
    2009-09-01 16:22:13 +0200 jl  r275666 : #i104339# small content change
    2009-09-01 14:20:42 +0200 jl  r275660 : #i103519# remove some debug output
    2009-09-01 13:51:52 +0200 jl  r275659 : #i103519# NSS uses '\' for escaping in distinguished names
    2009-09-01 12:49:47 +0200 mav  r275655 : #i104389# use zip-mode to read from jar files
    2009-09-01 12:40:22 +0200 mav  r275653 : #i104389# use zip-mode to read from jar files
    2009-09-01 12:32:29 +0200 mav  r275652 : #i104389# use constants
    2009-08-31 21:58:00 +0200 mav  r275637 : #i10000# fix warning
    2009-08-31 21:11:17 +0200 mav  r275636 : #i104227# adding of scripting signature removes the document signature
    2009-08-31 20:55:05 +0200 mav  r275635 : #i103905# ZipStorage supports Compressed property
    2009-08-31 20:53:55 +0200 mav  r275634 : #i103905# adjust macro signature transfer to usage of ZipStorage
    2009-08-31 15:30:49 +0200 jl  r275609 : #i103989# warning is shown as long the user does not click 'OK'
    2009-08-31 14:36:10 +0200 jl  r275608 : #i103989# changed warning text when signing macro and there is a document signature. This warning is only displayed once
    2009-08-31 13:34:41 +0200 mav  r275603 : #i104452# disable macros in repaired documents
    2009-08-31 13:33:42 +0200 mav  r275602 : #i104452# disable macros in repaired documents
    2009-08-31 13:03:56 +0200 jl  r275600 : #i45212# signature dialog could not be started when using read-only documents
    2009-08-31 09:26:13 +0200 mav  r275583 : #i104578# store the additional entry as the last one to workaround parsing problem in OOo3.1 and later
    2009-08-30 20:54:25 +0200 mav  r275562 : #i10000# adopt for unix
    2009-08-30 10:56:00 +0200 mav  r275561 : CWS-TOOLING: rebase CWS encsig09 to trunk at 275331 (milestone: DEV300:m56)
    2009-08-28 16:34:00 +0200 mav  r275539 : #i104578# write necessary info in manifest.xml for ODF1.2 encrypted document
    2009-08-28 14:04:22 +0200 mav  r275533 : #104587# fix handling of readonly streams
    2009-08-28 13:58:10 +0200 mav  r275531 : #i104389# fix the broken document handling
    2009-08-28 11:40:39 +0200 mav  r275522 : #i104389# fix the signature streams check
    2009-08-27 21:48:12 +0200 mav  r275509 : #i103927# show the warning
    2009-08-27 21:47:48 +0200 mav  r275508 : #i103927# show the warning
    2009-08-27 16:45:59 +0200 jl  r275495 : #i45212# remove unused variable
    2009-08-27 16:34:00 +0200 jl  r275494 : #i103989#
    2009-08-27 13:54:28 +0200 jl  r275482 : #i103519# fixed replacement of 'S' by 'ST'
    2009-08-27 12:32:21 +0200 mav  r275472 : #i10000# fix warning
    2009-08-27 11:58:11 +0200 mav  r275467 : #i104389# handle the entry path correctly
    2009-08-26 17:18:35 +0200 jl  r275438 : #i103519# subject and issuer distinguished names were not properly displayed. The strings were obtained by system functions (Windows, NSS), which use quotes to escape the values, when they contain special characters
    2009-08-26 11:00:20 +0200 mav  r275403 : #i10000# fix warnings
    2009-08-26 08:25:45 +0200 mav  r275392 : #i10000# fix warning
    2009-08-26 08:02:22 +0200 mav  r275391 : #i10000# adopt for linux
    2009-08-26 07:40:30 +0200 mav  r275390 : #i10000# fix warning
    2009-08-26 07:35:28 +0200 mav  r275389 : #i10000# use correct include file name
    2009-08-25 15:01:41 +0200 jl  r275356 : #i103989# better check for mimetype of streams
    2009-08-25 09:07:09 +0200 mav  r275335 : CWS-TOOLING: rebase CWS encsig09 to trunk at 274622 (milestone: DEV300:m54)
    2009-08-24 18:17:02 +0200 mav  r275329 : #i103927# check the nonencrypted streams
    2009-08-24 18:14:14 +0200 mav  r275328 : #i103927# check the nonencrypted streams
    2009-08-24 17:59:34 +0200 mav  r275327 : #i103927#,#i104389# check the package consistency and nonencrypted streams
    2009-08-24 16:18:28 +0200 jl  r275323 : #i103989# added comment
    2009-08-24 13:08:47 +0200 jl  r275305 : #i45212# #i66276# only write the X509Certificate element once and allow to add remove several certificates at a time
    2009-08-21 12:57:28 +0200 ufi  r275239 : 104339
    2009-08-21 08:39:05 +0200 jl  r275213 : #i10398# comparing URIs of signed files with the 'element list'
    2009-08-20 13:39:47 +0200 jl  r275178 : #i10398# displaying 'new partially signed' status in the status bar
    2009-08-20 13:35:39 +0200 jl  r275177 : #i10398# displaying 'new partially signed' status in the status bar
    2009-08-20 13:29:06 +0200 jl  r275176 : #i10398# displaying 'new partially signed' status in the status bar
    2009-08-20 13:26:21 +0200 jl  r275175 : #i10398# displaying 'new partially signed' status in the status bar
    2009-08-20 12:05:09 +0200 ufi  r275170 : i104339
    2009-08-19 12:24:54 +0200 jl  r275146 : #i10398# displaying 'old signature' icon and status in signature dialog
    2009-08-18 15:18:48 +0200 jl  r275111 : #i103989# document signatures containing manifest.xml are now validated according to the final ODF1.2 spec
    2009-08-18 11:41:06 +0200 mav  r275087 : #i103927# detect if encrypted ODF1.2 document contains nonencrypted streams
    2009-08-18 11:35:13 +0200 mav  r275085 : #i103927# detect if encrypted ODF1.2 document contains nonencrypted streams
    2009-08-14 17:32:41 +0200 jl  r274999 : #i103989# using c14n tranformation for XML streams
    2009-08-14 15:27:43 +0200 jl  r274987 : #i103989# remove special handling for encrypted document streams in UriBindingHelper::OpenInputStream, since we use zip storage this is not necessary anymore
    2009-08-14 15:08:10 +0200 jl  r274983 : #i103989# Showing a message when adding or removing a macro signature, that the document signature will be removed
    2009-08-14 14:57:27 +0200 jl  r274982 : #i103989# accesing Sequence at invalid index
    2009-08-11 08:55:02 +0200 mav  r274846 : #i103905# let signing service know if there is already a valid document signature
    2009-08-10 11:33:37 +0200 jl  r274799 : #i103905# do not truncate the stream
    2009-08-10 10:43:47 +0200 mav  r274797 : #i103905# provide the storage version
    2009-08-07 16:58:46 +0200 jl  r274780 : #i103989#
    2009-08-07 16:56:19 +0200 jl  r274779 : #i103989# using odf version string etc.
    2009-08-07 15:20:53 +0200 mav  r274771 : #i103905# provide the storage version
    2009-08-07 15:19:12 +0200 mav  r274770 : #i103905# provide the storage version
    2009-08-07 12:41:45 +0200 mav  r274758 : #103930# do not store thumbnail in case of encrypted document
    2009-08-07 12:36:52 +0200 mav  r274757 : #i103905# provide the storage version
    2009-08-07 12:15:54 +0200 mav  r274754 : #i103760# the signed state is not lost on saving
    2009-08-07 12:06:19 +0200 mav  r274753 : #i103760# avoid warning regarding signature removal on export
    2009-08-07 12:06:01 +0200 mav  r274752 : #i103760# avoid warning regarding signature removal on export
    2009-08-06 08:47:34 +0200 mav  r274703 : #i103905# allow to transport ODF version to the signing component
    2009-08-05 21:34:42 +0200 mav  r274701 : #i103905# allow to transport ODF version to the signing component
    2009-08-05 15:48:17 +0200 mav  r274683 : #i103905# allow to transport ODF version to the signing component
    2009-08-05 14:58:12 +0200 jl  r274673 : #i103989# documentsignature now signes all streams except documentsignatures.xml, all streams are processed as binary files
    2009-08-05 12:00:32 +0200 mav  r274648 : #i103905# allow to transport ODF version to the signing component
    2009-08-04 10:57:04 +0200 jl  r274612 : #i103989# added XInitialization
    2009-07-31 10:32:27 +0200 mav  r274516 : #i103905# use zip storage to sign documents
    2009-07-30 14:01:33 +0200 mav  r274489 : #i103906# optimize the usage of temporary medium
    2009-07-30 14:00:28 +0200 mav  r274488 : #i103906# optimize the usage of temporary medium
    2009-07-30 13:59:09 +0200 mav  r274487 : #i103906# optimize the usage of temporary medium
    2009-07-30 13:50:44 +0200 mav  r274485 : #i103906# optimize the usage of temporary medium
    2009-07-30 13:49:53 +0200 mav  r274484 : #i103906# optimize the usage of temporary medium
    2009-07-30 13:49:13 +0200 mav  r274483 : #i103906# optimize the usage of temporary medium
    2009-07-30 13:47:09 +0200 mav  r274482 : #i103905#,#i103906# let the signing process use zip-storage; optimize the usage of temporary medium
    2009-07-21 09:10:31 +0200 mav  r274159 : CWS-TOOLING: rebase CWS encsig09 to trunk at 273468 (milestone: DEV300:m51)
    2009-05-05 08:39:01 +0200 mav  r271496 : #i100832# allow to sign macros only when there are any

diff --git a/offapi/com/sun/star/embed/Storage.idl b/offapi/com/sun/star/embed/Storage.idl
index 428528a..958d973 100644
--- a/offapi/com/sun/star/embed/Storage.idl
+++ b/offapi/com/sun/star/embed/Storage.idl
@@ -347,6 +347,19 @@ service Storage
         </p>
      */
     [property, optional, readonly] boolean HasEncryptedEntries;
+
+    // -----------------------------------------------------------------------
+    /** allows to detect if the storage contains nonencrypted entries.
+
+        <p>
+        In case it is set to <TRUE/> the storage itself and/or a tree of
+        substorages contains nonencrypted streams. Usually in case this
+        property is supported the implementation supports
+        <type>XEncryptionProtectedSource</type> interface.
+        </p>
+     */
+    [property, optional, readonly] boolean HasNonEncryptedEntries;
+
 };
 
 //============================================================================
diff --git a/offapi/com/sun/star/security/DocumentSignatureInformation.idl b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
index 80af582..171d69c 100644
--- a/offapi/com/sun/star/security/DocumentSignatureInformation.idl
+++ b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
@@ -59,6 +59,25 @@ struct DocumentSignatureInformation
        <type scope="com::sun::star::security">CertificateValidity</type>.
      */
     long CertificateStatus;
+    /* indicates what content of a document is signed.
+        <p>
+        This value can be ignored when this struct is returned as part of 
+        a macro signature validation.
+        As of OpenOffice.org 3.2 and ODF 1.2 the document signature comprises 
+        all files except the signature file itself. 
+        Signatures in OOo 2.x were only
+        applied to the files in the root of the document, except mimetype, the 
+        Pictures and ObjectReplacements/Objects folder. That is, macros
+        were not part of the document signature.
+        OOo 3.0 signed everthing, execept mimetype and the META-INF folder.
+        <p>
+        If PartialDocumentSignature is true, then the signature was created by OOo
+        with a version less then 3.2. In this case, not all files are signed. The 
+        signature can still be regarded as valid, as long as SignatureIsValid is true
+        and the certificate could be validated. However, users should be notified about
+        the fact, that not everything in this document is signed.
+    */
+    boolean PartialDocumentSignature;
 
 };
 
diff --git a/offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl
new file mode 100644
index 0000000..476357a
--- /dev/null
+++ b/offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: DocumentMacroConfirmationRequest.idl,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_task_DocumentMacroConfirmationRequest2_idl__
+#define __com_sun_star_task_DocumentMacroConfirmationRequest2_idl__
+
+#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
+#include <com/sun/star/embed/XStorage.idl>
+#include <com/sun/star/security/DocumentSignatureInformation.idl>
+
+
+//=============================================================================
+
+module com { module sun { module star { module task { 
+
+//=============================================================================
+
+/** describes the request to approve or deny the execution of macros contained in
+    a document.
+ */
+exception DocumentMacroConfirmationRequest2 : ClassifiedInteractionRequest
+{
+    /** specifies the URL of the document which contains macros whose execution
+        should be approved or rejected.
+    */
+    string  DocumentURL;
+
+    /** refers to the zip-storage related to the last commited version of the
+        document.
+
+        This storage is necessary e.g. for displaying the existing signatures to
+        the user, to allow him a decision whether or not to trust those signatures
+        and thus the signed macros.
+
+        @see ::com::sun::star::security::XDocumentDigitalSignatures::showScriptingContentSignatures
+    */
+    ::com::sun::star::embed::XStorage
+            DocumentZipStorage;
+
+    /** contains informations about the ODF version of the document
+    */
+    string DocumentVersion;
+
+    /** contains informations about the signatures in the document
+    */
+    sequence< ::com::sun::star::security::DocumentSignatureInformation >
+            DocumentSignatureInformation;
+};
+
+//=============================================================================
+
+}; }; }; }; 
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
index 1559901..5b82671 100644
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
@@ -45,6 +45,7 @@ PACKAGE=com$/sun$/star$/task
 IDLFILES=\
     ClassifiedInteractionRequest.idl\
     DocumentMacroConfirmationRequest.idl\
+    DocumentMacroConfirmationRequest2.idl\
     DocumentPasswordRequest.idl\
     DocumentMSPasswordRequest.idl\
     ErrorCodeRequest.idl\


More information about the ooo-build-commit mailing list