diff options
author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-10-30 11:06:18 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-10-31 12:03:30 +0100 |
commit | 1a9261124eed5baa04b069a1cb1b51f24423ec9b (patch) | |
tree | 1cb64575ef26bb2790e73b51371eff869f44cc13 /offapi | |
parent | CMIS UCP: fixed crash when URL to server is wrong, or server down (diff) | |
download | core-1a9261124eed5baa04b069a1cb1b51f24423ec9b.tar.gz core-1a9261124eed5baa04b069a1cb1b51f24423ec9b.zip |
CMIS: added cancelCheckOut and checkIn implementations and menu items
Although the implementation is here, the dialogs to show when clicking
on the menu items aren't there yet.
Change-Id: I14886ec8ea8b97a35ca6c8474bc33e30da1a86d3
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/UnoApi_offapi.mk | 1 | ||||
-rw-r--r-- | offapi/com/sun/star/document/XCmisDocument.idl | 16 | ||||
-rw-r--r-- | offapi/com/sun/star/ucb/CheckinArgument.idl | 60 |
3 files changed, 77 insertions, 0 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index d5a65a3c9184..7e1bc58fcea4 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -3768,6 +3768,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\ AlreadyInitializedException \ AuthenticationRequest \ CHAOSProgressStart \ + CheckinArgument \ CertificateValidationRequest \ Command \ CommandAbortedException \ diff --git a/offapi/com/sun/star/document/XCmisDocument.idl b/offapi/com/sun/star/document/XCmisDocument.idl index c456808071d9..fabd69f087a0 100644 --- a/offapi/com/sun/star/document/XCmisDocument.idl +++ b/offapi/com/sun/star/document/XCmisDocument.idl @@ -24,10 +24,26 @@ interface XCmisDocument : com::sun::star::uno::XInterface */ void checkOut( ); + /** Cancel checked out document, this will discard all changes since + check-out. + */ + void cancelCheckOut( ); + + /** Creates a new version of the document from the private working + copy. + */ + void checkIn( [in] boolean isMajor, [in] string comment ); + /** Tells whether a document can support versioning or not. */ boolean isVersionable( ); + boolean canCheckOut( ); + + boolean canCancelCheckOut( ); + + boolean canCheckIn( ); + /** Contains the properties values named after their CMIS ID. */ [attribute] com::sun::star::beans::PropertyValues CmisPropertiesValues; diff --git a/offapi/com/sun/star/ucb/CheckinArgument.idl b/offapi/com/sun/star/ucb/CheckinArgument.idl new file mode 100644 index 000000000000..08f6822a20d2 --- /dev/null +++ b/offapi/com/sun/star/ucb/CheckinArgument.idl @@ -0,0 +1,60 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +#ifndef __com_sun_star_ucb_CheckinArgument_idl__ +#define __com_sun_star_ucb_CheckinArgument_idl__ + + + +module com { module sun { module star { module ucb { + +/** contains information needed to checkin a document. + + <p>The checkin command is always called on the target private + working copy document.</p> +*/ +struct CheckinArgument +{ + /** Tells whether to create a new major or minor version during the + checkin. + */ + boolean MajorVersion; + + /** Contains the version comment to set during the checkin. + */ + string VersionComment; + + /** contains the URL of the source of the action (e.g. the URL of + the temporary file to checkin). + */ + string SourceURL; + + /** contains the URL of the private working copy to checkin. + */ + string TargetURL; + + /** contains the title of the transferred object, if it is different + from the original one. + + <p>If this field is filled, for example, a file will be renamed + while it is being checked in.</p> + */ + string NewTitle; + + /** contains the Mime-Type of the content to check-in as it may be + different from the original one. + */ + string MimeType; +}; + + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |