New branch 'private/jmux/mailmerge-fixes-latest' available with the following
commits:
commit 51089a0588587ffea23c4facead3c80cefee2648
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Aug 9 00:22:00 2014 +0200
fdo#78611 Don't create automatic rules on reset
As we reset all styles, there shouldn't be any unknown automatic
SwNumRules, because all should have been created by the style
copying! And in this case we also have to overwrite the existing
automatic SwNumRules to get a consistent copy.
In case of unknown automatic SwNumRules we just warn and ignore
any inconsistence.
Change-Id: I26e25bccc9a8c7be74f3dceb2e1f91894eac1d0a
commit db54c19ccbc6bf3605343825f836b53f2cc06d94
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sun Aug 3 12:10:40 2014 +0200
fdo#81782 MM: copy most document properties
Mail merge wasn't copying the document properties into the target
document. It also has to copy most document properties into the
working copy, as ConvertFieldsToText is called just there.
Change-Id: I7e07fec712c225f667d960a94f4eb3fd0b83f041
commit 61978c3c99d03843a7b5e8514a061afc8e1a44ec
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 29 15:38:32 2014 +0200
MM: restore the non-saving wizard behaviour
The wizard didn't save the MM source document, even if it was modified.
Change-Id: I0c7fb6abd31934bab7a33d7a9c93222af3e35ee5
commit 3307e169db2846ba52a482f6b0caf07c9c58bc64
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 29 15:36:51 2014 +0200
MM: add missing CreateMonitor handling
The mail merge wizard uses a different progress dialog
(CreateDialog) then the UNO functions (PrintDialog).
This moves the "CreateDialog" code from the old mail merge function
and unifies some of the dialog handling.
Change-Id: I06088140f604893a33f3ee37507e551b043a193d
commit a33b00b2b78ee8e70f46ce1fde4a594d5548e637
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 29 15:31:00 2014 +0200
MM: refactor cancel handling for dbui dialogs
This simplifies the handling of CreateMonitor and PrintMonitor in
the combined mail merge function.
Change-Id: Iacf933ec1a6017949b29b3d5f62d5f55c4691053
commit e1be6c1e5534edf43822e58d757d4ae793d42634
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 29 14:26:40 2014 +0200
MM: Don't adapt the view when saving dbg documents
DoSaveCompleted updates the SwViewShell and recent file lists after
the document was saved via DoSaveAs. So we can simply drop the
call and delete the SfxMedium to save a copy.
Change-Id: I04a0710949ca60e1ff4cab24c6b504deb130db63
commit 399de756430c072a064dbb84b394412803f2e425
Author: Eilidh McAdam <eilidh.mca...@gmail.com>
Date: Fri Jul 25 20:38:08 2014 +0100
Remove superfluous merge function.
The only caller of MergeDocuments now uses MergeMailFiles instead,
so MergeDocuments can be removed.
Change-Id: I03903a7f85c8328ab3f28cb1d23130557a1be7b4
commit 9b9a9f22b1e3e088340527c3458ed2f514e9a66c
Author: Eilidh McAdam <eilidh.mca...@gmail.com>
Date: Fri Jul 25 20:35:43 2014 +0100
Make UNO and wizard mail merge use same function.
Instead of MergeDocuments and MergeMailFiles duplicating largely the
same functionality, the only user of MergeDocuments (MM wizard) now
uses MergeMailFiles.
Change-Id: Ifad183bdeabf5ca1eb08b4b1df557404a54a9fdd
commit 369bd7727deef10c1122a291018de4a48b3a15fb
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sun Jul 13 20:18:56 2014 +0200
Refactor a tiny bit of SwLayAction::IsShortCut
Change-Id: I13d4fbebec02bddaa27e8929188d497dde715730
commit 80872c8206b1bf2a7b25daafb53a94d342de01ef
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sun Jul 13 20:15:55 2014 +0200
fdo#80926 Don't move anchors of invalid pages
If the anchor is valid, check if its page is valid too,
before moving anchors on view change.
Change-Id: Idffdfdb786cb29a105c06d652e6ad7315abfb4c5
commit 1fb45dc4e052a0cb1c88fa45e4601cc7a6be9a69
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 29 11:09:01 2014 +0200
MM: Fix language for DB dict values
Based on the code from SwCalc::VarLook.
Change-Id: I44220b0fb8332785105719f253897d2177c9c69c
commit 11ec72697670a1ba77e9931200df6da4a8771131
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Jul 12 23:17:31 2014 +0200
fdo#70346 MM: add mail merge data to condition dict
Currently section hide conditions are just evaluated based on
document field data.
This adds the current mail merge dataset to the condition
dictionary, so this can be used in the condition evaluation.
The dataset values are named from their columns and added initially,
therefore DB fields with identical names will overwrite the values
in the dictionary!
Change-Id: I82a5f9f6962628a76c836e8e2a7c9e264fdc16e0
commit 5f17254896a4c2226425db66c85ac7604e52fa25
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Jul 12 19:27:11 2014 +0200
Invalidate rect cache before moving object
Otherwise I get sw/source/core/layout/anchoredobject.cxx:582:
<SwAnchoredObject::GetObjRectWithSpaces> - cache for object
rectangle inclusive spaces marked as valid, but it couldn't be.
Missing invalidation of cache. Please inform OD.
Change-Id: I3f315b15fca6e2480c11183269be5583e6aea123
commit a6f514ccc9ecff0362ddd7d2a61aa01bfe442d8c
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Jul 12 13:35:54 2014 +0200
Fix moving out-of-bounds draw / fly objects
Actually move the object in the right direction, if it's outside
of the document boundaries.
Fixes the mysterious effect, that negative y-offset in fdo#80926
changed the objects x-offset values.
Change-Id: If88cf2a07fb44537b2e047e77c5e009664db94af
commit dc32b8effb8e7870633d419670a59427960e4218
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Jul 12 13:34:01 2014 +0200
Better variable naming in SwViewImp::NotifySizeChg
Make it obvious, which variable contains the document boundaries and
which the draw / fly object boundaries.
Change-Id: I0bc2bcb5515e317c7a204b3458b92c61482e1a5c
commit f8fdf1da4ea90725f2d33e290da1e90091f9ebe8
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jun 9 17:31:49 2014 +0200
.gitignore /.gdb_history
Change-Id: I254c0104010cc1a1c12bbf1af048966de66924e6
commit 8eda8b9e5ed9e173bb55f9f768da01cf0102b329
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 1 15:45:47 2014 +0200
Fix single node CopyRange
Change-Id: Iadf21d3928303c2ab8df0d93dabd969ed1ff7e09
commit 0440cd0046c2c7ae8531c6afe996aa8dcd215191
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 1 21:42:30 2014 +0200
Normalize SwDBManager::Merge{MailFiles,Documents}
There is still a difference, if run mail merge throught one or
the other function (MM wizard or UNO).
Change-Id: Ia372bd3edea4c8dfb58e045fc8fed2efcb2a4fde
commit b5492c1b4849037e29da1977f1b20fd6021e5286
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 1 21:31:35 2014 +0200
Add debug documents to SwDBManager::MergeMailFiles
Just like the debug documents in SwDBManager::MergeDocuments.
Change-Id: I275575853c80d4e19d6df5ba9d8dc689353d7c85
commit 7624a2c18243f9904daa5ba1ee12a00da90179ce
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 1 15:48:01 2014 +0200
Add debug messages for sw.{createcopy,docappend}
This adds a lot of SAL_INFO messages to SwDoc::CreateCopy and
SwDoc::Append.
Change-Id: Ie924e20698bec84482fcc5496175a9e29245729e
commit a3bf3b255c2be59c2df307854f5ff3e6c6b17bf2
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Tue Jul 1 13:02:58 2014 +0200
Refactor NumRule handling in CopyImpl
The bug fix for i#86492 added a lot of duplicated code. This moves
the code into their own functions and uses macros to make the
resulting code even more readable.
Change-Id: Ifa0ece26f3152f1f8d8c65173b459e8c14c5b43a
commit 31ae5e96f46c27cfbbb2ee913884584ef449474c
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sat Jun 28 01:41:17 2014 +0200
MM: introduce SwDoc::Append helper function
This drops all the specialized, workaround code from MM, introduced
to use the SwFEShell::Paste function and additionally merges
and renames SwDoc::Paste into SwDoc::Append.
There is still a little common codepath, therefore this adds
comments to always update both functions.
Change-Id: I704b3ef3257dd977dac95e16e25049ff8ade97ed
commit 53c8427b6247f1323dd318b0ee5f34d63b596fd7
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jun 23 09:27:27 2014 +0200
MM: always copy the internal document
There is really no need to create the first document via UNO
createClone(), which is also slower then the internal copy.
Actually createClone also calls createCopy, but without
initializing the document.
Change-Id: I23437b0f3ad663942a02be575b39883f9a3b8587
commit e0a7999873bc5f3ae23d201fdb7c8dccc0142f84
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jun 27 14:58:24 2014 +0200
Some minor MM related refactoring
Refactors some code of SwFEShell::Paste and
SwDBManager::MergeDocuments to make it more readable.
Change-Id: Ifd78d6a44fa78eaf1f4fca63f4bbd3ee43ca129d
commit b93e1629dfdee5d04745be86443bc35aadca609e
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Fri Jun 27 11:28:02 2014 +0200
MM: fix workaround for single paragraph docs
There is already a workaround for pasting a document with a single
paragraph by appending a dummy empty paragraph to the working copy.
This patch removes the dummy paragraph from the target document.
Change-Id: I288d35264bf6f1a5f92c50d6a309e3bdd4ab5836
commit d6ef8fcc633200d7a6633618928e34063ecd289e
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Mon Jun 23 09:16:18 2014 +0200
Replace the whole content for copied documents
If the document is initialized in CreateCopy, it already contains
the initial empty paragraph. So we have to delete the content from
initial document, as we're going to replace the whole content with
the pasted document.
Change-Id: I33faed4de77919fb926d408e19af9c1ec3b0f7d3
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
