diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-09-15 00:13:06 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-10-01 10:32:42 +0200 |
commit | 9835bb562cfe3a5d386c24d86176ba7bb5ab26d2 (patch) | |
tree | 4f799aae7b90d8b23e487765d67243b00a205131 /offapi | |
parent | 0a5cd87e591d7f87bfab92716079af719259f143 (diff) |
MM: export the SwDocShell mail merge via UNO
This saves the loading time for large document. Use it if you
want to present the generated document to the user or write a
mail merge unit tests.
This includes:
* renaming "only" to "shell" at multiple occurences
* dropping the DBMGR_MERGE_SINGLE_FILE special type for the mail
merge wizard in favour of an additional SwMergeDescriptor
boolean
* cleanup and renaming of the internal merge type enums, so these
actually match the diffferent merge targets: printer, email,
file and shell
Change-Id: I33c6773972195193687ba9c3e12b562310d330c1
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/com/sun/star/text/MailMergeType.idl | 9 | ||||
-rw-r--r-- | offapi/type_reference/offapi.idl | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/offapi/com/sun/star/text/MailMergeType.idl b/offapi/com/sun/star/text/MailMergeType.idl index 4c735320bd8c..7099a8dc7e84 100644 --- a/offapi/com/sun/star/text/MailMergeType.idl +++ b/offapi/com/sun/star/text/MailMergeType.idl @@ -45,6 +45,15 @@ published constants MailMergeType */ const short MAIL = 3; + + /** The output is a document shell. + + The successful mail marge returns a XTextDocument based component. + + @since LibreOffice 4.4 + */ + const short SHELL = 4; + }; diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl index fc5b7953095f..fb4b93bb3e3e 100644 --- a/offapi/type_reference/offapi.idl +++ b/offapi/type_reference/offapi.idl @@ -14535,6 +14535,7 @@ module com { const short FILE = 2; const short MAIL = 3; const short PRINTER = 1; + const short SHELL = 4; }; published service NumberingLevel { [property] short Adjust; |