[Libreoffice-commits] core.git: Changes to 'private/jmux/mailmerge-fixes'

[Jan-Marek Glogowski]

New branch 'private/jmux/mailmerge-fixes' available with the following commits:
commit a6419672dadd6777bd7f1ecddaf05abc0440eea0
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Jun 26 20:23:39 2014 +0200

    Merge SwDoc::Paste into SwDoc::CreateCopy
    
    Change-Id: I95686eb116e17b4da6662b4fbadcf08a0b92a6f4

commit d555236a488e41e0170c702b1167c0c461fdb046
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Jun 26 13:19:56 2014 +0200

    Fixup
    
    Change-Id: I026f0e5122e58d948f20a05fe9143a0bfdf65810

commit 34456eb7095747e3f585bb6fc49beabce6a229af
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Mon Jun 23 09:10:22 2014 +0200

    Update SwDoc::Paste from SwFEShell::Paste
    
    SwDoc::Paste is already an minimal version of SwFEShell::Paste.
    
    Update the code based on the changes made in
        commit 4580094d2d9d5b952c4526ee23204f75a5bb2f1b
    
    Change-Id: I4d784f393952374e2a174510f9378b05cfdb78eb

commit d6ad1bc970e1fffe046990a3668a9e2fc9c63959
Author: Jan-Marek Glogowski <glogow at 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 e56db6cb805834cd28cc7dab68c4db6739afa9b6
Author: Jan-Marek Glogowski <glogow at 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

commit 7e0d22008eb94d8474cf521197542819fe93fc77
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jun 13 14:44:37 2014 +0200

    Revert "fdo#66145: do not check IsFirstShared() in SwPageDesc::GetLeftFmt()"
    
    This reverts commit 4df438c9a9d5e698c47c1e85903eb81880a5e6fa.
    
    Conflicts:
    
    	sw/source/core/layout/pagedesc.cxx
    
    Change-Id: I8f8d32c07f8706fad6c62fba2a9a373feed6cbed

commit 0dae9bf70891a0e817ceb6ad783a3829a8bf8e23
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Mon Jun 23 08:43:08 2014 +0200

    Save debug mail merge documents
    
    This saves the first three mail merge documents, the source and
    the corresponding working documents.
    
    For convenience all saved document URIs printed to the console.
    
    Change-Id: Ice86bf59fc519cfab170ff0956559dc9373d5a26