[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

[Michael Stahl]

 sw/source/core/layout/frmtool.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7fea9d676296b380aa18a13d361f1c08957e5ec3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Feb 4 23:26:50 2013 +0100

    fdo#60250: InsertNewPage: copy margins for mirrored pages
    
    When there is no explicit first page, set the proper left or right
    margins, which are different for mirrored page styles.
    (regression from a964cf666abb0c4df4e29ea8709532b7d45c104f)
    
    Change-Id: I56ccc6f7987accefc27d627d2427ee37d83bd758
    (cherry picked from commit 2fc87188bd4a73d25b64b32e0287cee5d6ee4a48)
    Reviewed-on: https://gerrit.libreoffice.org/1987
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 9a60553..bdc6138 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2742,11 +2742,14 @@ SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
             {
                 rDesc.GetFirst().SetFmtAttr( rDesc.GetMaster().GetHeader() );
                 rDesc.GetFirst().SetFmtAttr( rDesc.GetMaster().GetFooter() );
+                // fdo#60250 copy margins for mirrored pages
+                rDesc.GetFirst().SetFmtAttr( rDesc.GetMaster().GetLRSpace() );
             }
             else
             {
                 rDesc.GetFirst().SetFmtAttr( rDesc.GetLeft().GetHeader() );
                 rDesc.GetFirst().SetFmtAttr( rDesc.GetLeft().GetFooter() );
+                rDesc.GetFirst().SetFmtAttr( rDesc.GetLeft().GetLRSpace() );
             }
         }
         pFmt = rDesc.GetFirstFmt();