New branch 'private/jmux/libreoffice-4-1-6+backports+unit' available with the following commits: commit 12cb3f789293d009b11a65103923cbfb31bfc7b7 Author: Jan-Marek Glogowski <glo...@fbihome.de> Date: Fri Oct 10 14:04:22 2014 +0200
fixup Change-Id: Ie94d61058ddd6adf9fb1407e379188c651b3ea1f commit f00869e5be0bb7584892495f33d55d5f4a088e0f Author: Noel Grandin <n...@peralex.com> Date: Wed Oct 1 13:02:57 2014 +0200 blind fix for windows build Change-Id: I8c3d8ccccb039bc82b23d74b41ca4254f50d5c84 (cherry picked from commit 99bb7d664ef6c809ff6478fe2335c8a4a00e141b) commit ea6412391b571e66be5de03107ee0d1f75ba54a0 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Oct 1 11:31:35 2014 +0200 loplugin:implicitboolconversion Change-Id: Ia63460949a3ba58f0394f5b94e0d906ca7849710 (cherry picked from commit a5824fa97c7300faca3b09fe0922c9f319b3c49b) commit 97d1c684af5f05cd6fc5add35709885239b1fbad Author: Jan-Marek Glogowski <glo...@fbihome.de> Date: Tue Sep 23 10:00:13 2014 +0200 MM: first unit test and infrastructure Extendes SwModelTestBase with mail merge functions and a declaration of the DECLARE_MAILMERGE_TEST macro and uses it in a first test. As most tests it's registered as a slow test run by 'make check'. The broken MM used to drop the leading empty pages, which resulted in a document with 4 pages and the two page bound draws merged per single page. Tests the MM result for page count (eight) and each draw anchor to be on a different page. (cherry picked from commit d10f6d49b77dcf955629901937d8d5e3a2976a6c) Conflicts: sw/Module_sw.mk sw/qa/extras/inc/swmodeltestbase.hxx Change-Id: Iab17f5844e68221d48cb89863323bcfe4c8ae0d2 commit 2f3db8081c56cd91e5837978ddeae62788f34e0b Author: Jan-Marek Glogowski <glo...@fbihome.de> Date: Mon Sep 15 00:48:59 2014 +0200 MM: add non-UI LoadAndRegisterDataSource function For the mail merge unit test we need a function to register new database sources without any UI interaction. This refactors and introduces new versions of LoadAndRegisterDataSource, which gets all previously interactive values as arguments. (cherry picked from commit 5187ce45b93e5e841e541eac98da3fa2110fe632) Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: I1601b4112ddc800a0935950133d386ce349b9087 commit bf07857ff32d887bd215745430cfb6552577ff28 Author: Jan-Marek Glogowski <glo...@fbihome.de> Date: Mon Sep 15 00:13:06 2014 +0200 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 (cherry picked from commit 9835bb562cfe3a5d386c24d86176ba7bb5ab26d2) Conflicts: offapi/type_reference/offapi.idl sw/inc/dbmgr.hxx sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.hxx sw/source/ui/envelp/mailmrge.cxx sw/source/uibase/dbui/dbmgr.cxx sw/source/uibase/inc/mailmrge.hxx sw/source/uibase/uno/unomailmerge.cxx Change-Id: I33c6773972195193687ba9c3e12b562310d330c1 commit 12052969b6edf9119f60d685a170f2fd442f2e67 Author: Jan-Marek Glogowski <glo...@fbihome.de> Date: Mon Sep 15 00:00:03 2014 +0200 MM: dump debug documents based on environment var Introduce SW_DEBUG_MAILMERGE_DOCS=<n> to dump n mail merge debug documents (partly merged and working copies). This will speed up mail merge unit tests and allows dumping of an arbitrary amount of intermediate mail merge documents. (cherry picked from commit 0a5cd87e591d7f87bfab92716079af719259f143) Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: Idb9fc19f99ccafe5574897bd1e687d439c52ebe5 commit 4896a4984473857d5b12df69a287c44c485105b7 Author: Michael Stahl <mst...@redhat.com> Date: Fri Sep 12 21:50:36 2014 +0200 :sw: rename SwDoc::Append to something unique (cherry picked from commit 3b11057b75434526f67e678ddc1deb9ebd61c752) Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: Ibb9db5ecdea6439df20fc1ee609267dcdd864405 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits