[Libreoffice-commits] core.git: Changes to 'private/jmux/mm-cleanup2'

[Jan-Marek Glogowski]

New branch 'private/jmux/mm-cleanup2' available with the following commits:
commit ce27dda10e9c297b10277f7edee4465749fa8b74
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jan 8 21:31:24 2016 +0100

    rest2
    
    Change-Id: If1dd726fc3a7f268f08ec0035a2cf0f23e7aff8a

commit 8901a741ca78cb132dbad9ee33f50e1428e02722
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jan 8 21:29:09 2016 +0100

    comments
    
    Change-Id: Id6df845d0f6d98b6be35a399da23099898aa34cb

commit 9bd04925b63aa59e8497780c5fb4f8dff8814e40
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jan 8 21:24:46 2016 +0100

    MM: don't send email if document generation failed
    
    Change-Id: I91d13d0694c0586a2dbc159f7ba9d53086b6746c

commit e6425310a41261a4dc3eac81076b61638a07a5d0
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jan 8 18:51:54 2016 +0100

    MM: some assertion on MM input
    
    Change-Id: Id29ede49acf86ad6109eab88fbae5d9bbb2d8720

commit afb7d4df9e651d9fe183f01eff4dc7129911dfcb
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jan 8 18:22:04 2016 +0100

    MM: abort email MM without a email DB column
    
    Change-Id: Ia35a64d08f47af577426749712fa37c3b3b0b6e6

commit 4a58a06c7a8504e01206423154a7eeb8d4edf501
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jan 8 17:13:30 2016 +0100

    MM: move email subject and address into descriptor
    
    Change-Id: I1b583f4a67279a229329ba7cd15fb8d2c215737c

commit 705981826de744d16227da2dec00248ad234e2da
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jan 8 11:18:00 2016 +0100

    MM: don't generate documents for invalid emails
    
    If we don't have a valid mail address, there is no point merging a
    document. But now the first document is probably skipped, so all
    the setup has to be handled differently.
    
    We also have to account differently for documents with fields of
    type RES_DBNEXTSETFLD or RES_DBNUMSETFLD, as these would advance
    the document cursor for multiple rows.
    
    Sadly there is currently no way to inform the user of bad email
    entries. As before these entries are just skipped.
    
    Change-Id: I2b02174e173b8b721c7394d47febfefd3b3066e9

commit d74de363a4c7e81426a671eab270dea97aee74ca
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jan 8 13:26:23 2016 +0100

    MM: cleanup single file case finish
    
    Took me a while to realize most of the post-mm code actually
    depends on bCreateSingleFile, which simplifies the codes
    structure.
    
    Change-Id: Ifd8a8a882d9902bedd40c8b1d1e4a8507b5877fe

commit cb79c4cbf120598932c3a10c64190eefbd9c4a1c
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jan 8 09:54:11 2016 +0100

    MM: rename and constify variables
    
    Instead of the huge comparisons (in terms of text space), this
    deconstructs the mail merge type into smaller uppercase variables.
    
    bCancel is renamed to m_bCancel to especially distinguish it from
    the bNoError local variable, as both are supposed to be handled
    together.
    
    Otherall this should improve the readability of the code.
    
    Change-Id: I51ab17f7cd90a9e195d09dfcf37a0d194aa9fbbd

commit b60a460e08be7b3b1974fe6bd7c6cd71c7243deb
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jan 8 09:41:55 2016 +0100

    MM: refactor doc save and printer option code
    
    Moves the duplicated code for saving documents and configuring
    the printer into static local functions.
    
    Change-Id: I75f183a2a515ecbae276461613a05ab50c56e600

commit c31e32e38fd05a82e21ab6925b86838039c916b3
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Jan 7 10:11:12 2016 +0100

    Revert "tdf93236 N-UP printing in combination with mailmerge broken file-print 1/4"
    
    The whole pseudo-refactoring is actually not needed for the fix and
    just keeping the ToNextRecord merge.
    
    It also contains reverts of
      sw: remove include of sw/source/inc/uibase/dbui.hxx from dbmgr.hxx
      commit 4b01af28e6fee1ec3096ed713d1db832b3508420
    and
      coverity#1346891 Unused value
      commit 1876d9a807ee0b3480ab108273930897cc697d88.
    as these were results of the refactoring.

commit 3c254b9578d67acf3151620b3ed725009cc2d534
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Sat Jan 9 00:35:45 2016 +0100

    Optional debugrun arguments via ARGS=...
    
    Change-Id: Ic15754d7edcc448f283522338900684a29a03cf3