New branch 'feature/mailmerge-cleanup' available with the following commits:
commit 19b9b8162ad451b0323d12eb3a285270aed3c779
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Feb 10 19:24:50 2016 +0100
MM: fix debug document dumping
Previously the debug documents were dumped to the temporary mail
merge directory, which is removed at the end of MM. So this dumps
the document to an extra directory.
Also fixes the broken reinterpret_cast "env" => "int" conversation
to get the real number of documents, which work with multi-digit
numbers.
Change-Id: I456b506e9a70cffdfc93cb3eadd39c454a536343
commit e328625a636e89e694d80419729e1895b41e9d0a
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Feb 1 22:00:37 2016 +0100
MM: remove lock from saved documents
Actually we have to call DoSaveCompleted to get rid of the locking.
Instead this adds a parameter to skip the recent file registration
used in non bCreateSingleFile modes.
Change-Id: I57151f08ad8d737007da84c4566685cc37612dfb
commit 8fecce7bd97be08d64b6451b4807ba49dbcefb9e
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Jan 27 14:41:35 2016 +0100
MM: remove multiple unneeded indention levels
Change-Id: Ia363904d3c3fbabdb7aa0dd9aa0715d7d6982f85
commit ca081db823603829983d13485bc44fba43ed3039
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Jan 27 13:59:42 2016 +0100
MM: rename MergeNew => Merge
Since all old code from the original Merge function is gone, just
do the rename.
Change-Id: I7cc1b4b58cc73bea83a723b2478a8b4bf59a382f
commit 815ce894eac1aacfa14fd087ba9ed9fe39bef06f
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Jan 27 13:04:04 2016 +0100
MM: don't try to save the source MM document
Just create in internal copy, if the source document is modified.
Change-Id: I4587b3df5ff0b42c98f1b69fe18b4f11f5c9b8e4
commit 286bf6415b735efe03aa714798e2931ffa0129b9
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Jan 27 11:51:29 2016 +0100
MM: just show the print progress dialog for print
Change-Id: I75a33c14f4a2b5ab404ce937e5d23392f6021a1b
commit 56db7e3aaa061e22b9dfbdadad1f7862237c7e3c
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Jan 27 11:48:28 2016 +0100
MM: fix silent mode on merge start
We currently don't handle the change of silent mode during a running
mail merge job correctly, so don't allow it.
Change-Id: I2cb8cc1c737e93e8b2a90a6e73fb3e49008fe91d
commit 06aa11dcab854f3c56967d19e9805cfaf4137a19
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Jan 27 11:42:45 2016 +0100
MM: move mail creation into a local function
And also use C++11 range-based for loop loops.
Change-Id: I7bafc419a21cdd6bb7aaed7d67b640409d308f79
commit b4923181e5c293a1eb75ca5e137eb2277d0c4179
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jan 25 19:36:26 2016 +0100
MM: don't register files in recently used...
... in email and !bCreateSingleFile file mode. Also saves a bunch
of instructions. For my simple document it was ~10% of the save
time and 75% is the creation of the preview thumbnails...
Change-Id: I14f7092007b1acfed6cbe0f2f4cd6eaecd32b514
commit 212ab5f7c13f635c28a59634afa605ab6f9821bc
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jan 25 18:10:29 2016 +0100
MM: use working doc DB manager on save
This is related to tdf#97318 but doesn't fix it, as the wizard
works with a single merged document, which is split later.
When saving the working document in !bCreateSingleFile mode, we
have to restore the documents DB manager for two reasons:
1. We otherwise would save the whole database content.
2. We crash with embedded databases of the original DB manager.
Change-Id: I9b209854703ec95c2c63c83019e857f2d26f753d
commit 37fbb98d4d029f5f8935779826ffc772bb60c14e
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jan 25 17:48:15 2016 +0100
MM: correctly handle directory in dialog
For convenience we present file URLs in the systems local file
notation. But the directory selection dialog expects an URL, so
we have to convert the local notation from the edit entry to a
file URL.
Change-Id: Idff6f7d4b135eef087c61560b0603b9a6669dbf7
commit c7ddedec6ef7e803e4e4359a8f07faa9171c4307
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jan 22 21:25:11 2016 +0100
tdf#96914 MM: don't round trip the source document
To get a unmodified document, the mail merge via File -> Print
used to write a document and reload it. This is not a problem with
normal documents, but with embedded databases this results in a
second database with the same name, which disposes the first
registered database and the xResultSet from the mail merge dialog.
As a workaround this just creates an internal copy, sets the
correct database settings and resets the modified status.
We still need a more general solution to handle documents with the
same embedded DB name in a sane way, probably by making the embedded
database a private object of the documents database manager.
We also need to keep the IsLabelDoc information, otherwise
cloning label documents breaks MM due to undetected, existing
section links.
Change-Id: I20ddea30196d65cb89f69977867f012816ec6001
commit 4c218e1c94f038d7bd5898aed8feabeb79a24e31
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Jan 20 10:48:37 2016 +0100
tdf#95292 MM: cleanup bEndOfDB handling
bEndOfDB was handled inconsistently in ToNextRecord for record
selections and normal record iteration. The new unified semantics
are defined to set bEndOfDB for the first failing record fetch.
This includes a rename of the function ExistsNextRecord, which
did never check for a next record, but just verified the current
record set to be valid.
This way we can also drop the bAfterSelection selection, which
was just needed for the inconsistent bEndOfDB handling.
Change-Id: Ibbd7ae95e5969b51e32f44b442e5dc778655e8a9
commit 9e6864914bcd8cf9baada52e0908c78779bf0c4f
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jan 18 16:48:54 2016 +0100
MM: move SwPageDesc handling into SwDoc::AppendDoc
If you append a doc, you want to handle styles correctly. So it's
actually the correct way to handle the styles in AppendDoc.
The nDocNo is used instead of a boolean to speed up finding better
unique names in the mail merge case.
Change-Id: I4b16e89588164b9e0763759c7d719dfc204b63a1
commit c3ba376fe90c6bc35f0ffee35356e6c2ac822f22
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jan 18 15:04:12 2016 +0100
MM: merge cancel and error variable
An error always includes the "cancel", while a cancel doesn't have
to be an error. So merge handling by using an enum.
Change-Id: I154dccbd3063d7ce37ee3cb90b4f193cb1edd466
commit e0fb932639e4871acbd7b626bdde5de34210d1d0
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jan 11 13:49:30 2016 +0100
MM: cleanup of comments and asserts
Also adds a README to explain some of the code flow of MM.
Change-Id: I363fdd73824a8d41f7073b6de2e9c24184005397
commit 64d2b583c13f23a2ade51916fded397317613f29
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jan 11 13:45:02 2016 +0100
MM: a failing print job is an error
Change-Id: I0476d0084d6f7e70b123dbb25927822053ca4e1a
commit d497e5a4eaf3278f7e6fae012641953e4f9d5035
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jan 8 21:24:46 2016 +0100
MM: don't send email if document generation failed
Change-Id: I91d13d0694c0586a2dbc159f7ba9d53086b6746c
commit cecda6cf73674f0775824e8498573211b4287553
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jan 8 18:51:54 2016 +0100
MM: some assertion on MM input
Change-Id: Id29ede49acf86ad6109eab88fbae5d9bbb2d8720
commit e3ef41da1339c4c5a85095d8dd62e89a9dcab21d
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jan 8 18:22:04 2016 +0100
MM: abort email MM without an email DB column
Change-Id: Ia35a64d08f47af577426749712fa37c3b3b0b6e6
commit bd355f5feee790482bea26a580aa1bce13a162ac
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jan 8 17:13:30 2016 +0100
MM: move email subject and address into descriptor
Both are not related to the DBManager, but the mail merge job.
While at it, also drop the insane bSubjectIsFilename handling, add
an independent sPath and rename sAddressFromColumn to a more general
sDBcolumn, as it's also used for file name lookup in FILE mode.
Change-Id: I1b583f4a67279a229329ba7cd15fb8d2c215737c
commit 47d1af175f7bf6669acf47237f259b2344aa75d8
Author: Jan-Marek Glogowski <glo...@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 94cb6d57667688d068b7a89536b43a94e105aa00
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jan 8 13:26:23 2016 +0100
MM: cleanup bCreateSingleFile finish
Took me a while to realize most of the post-mm finalization code
actually depends on bCreateSingleFile. This allows us to simplify
the code structure.
Change-Id: Ifd8a8a882d9902bedd40c8b1d1e4a8507b5877fe
commit a867a769dc6513354a1732751e247c94efe29fd9
Author: Jan-Marek Glogowski <glo...@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 c3796386decb86f9c71c2c464107fdd1e728bb4b
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jan 8 09:41:55 2016 +0100
MM: refactor DBManager related duplicated code
Moves the duplicated code for saving documents, configuring the
printer and DB cursor forwarding (next record) into static local
functions.
Change-Id: I75f183a2a515ecbae276461613a05ab50c56e600
commit e8b001d694b1445da3a1d26157c269db294b28b3
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jan 19 14:05:37 2016 +0100
tdf#93236 Revert "support fast MM printing in...
non-single-file mode only for CUPS"
This reverts commit 138d29aa09417eba4d15ade4c9f4dab2620b6326.
The patch breaks all print opions affecting multiple pages, i.e.
page range selection, pages per sheet, blank pages, reverse page
order and copies.
Conflicts:
configure.ac
sw/source/uibase/dbui/dbmgr.cxx
vcl/inc/cupsmgr.hxx
vcl/unx/generic/printer/cupsmgr.cxx
Change-Id: I8c39e7f0e71ef9688254c0a0dba049e1836b733c
commit 97b2d7d31f909a4cbf08ac286e898aab371123dd
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jan 11 11:15:25 2016 +0100
Revert "tdf93236 N-UP printing in combination 1/4"
Whole subject was: "tdf93236 N-UP printing in with mailmerge broken
file-print 1/4"
This reverts all dbmgr.cxx changes, which were a result of this
commit. This patch merges the reverts for the following patches:
* "sw: remove include of sw/source/inc/uibase/dbui.hxx from dbmgr.hxx"
commit 4b01af28e6fee1ec3096ed713d1db832b3508420
* "coverity#1346891 Unused value"
commit 1876d9a807ee0b3480ab108273930897cc697d88
* "tdf93236 N-UP printing in combination with mailmerge broken file-print
1/4"
commit d8ff907197037045fd0cb173e341f515968b65b1
Change-Id: Ic51230c484fb9ee5dba2331c51ced1d20a787afa
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
