[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/writerwordglue.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 5220a3615a806224d3a54283da4abdaae4b15795
Author: Luke Deller <l...@deller.id.au>
Date:   Wed Dec 5 23:09:38 2012 +1100

    fix for fdo#57551: landscape/portrait sequence lost in FILESAVE as .doc
    
    Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce
    Reviewed-on: https://gerrit.libreoffice.org/1251
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/1387
    Reviewed-by: Miklos Vajna <vmik...@suse.cz>
    Tested-by: Miklos Vajna <vmik...@suse.cz>

diff --git a/sw/source/filter/ww8/writerwordglue.cxx 
b/sw/source/filter/ww8/writerwordglue.cxx
index 2c1bd54..6be5a8d 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -358,6 +358,8 @@ namespace sw
             const SwColumns& rFollowColumns = rFollowCols.GetColumns();
             const SvxLRSpaceItem &rOneLR = rTitleFmt.GetLRSpace();
             const SvxLRSpaceItem &rTwoLR= rFollowFmt.GetLRSpace();
+            const SwFmtFrmSize& rFirstFrmSize = rTitleFmt.GetFrmSize();
+            const SwFmtFrmSize& rFollowFrmSize = rFollowFmt.GetFrmSize();
 
             if (rFirstColumns.size() != rFollowColumns.size())
             {
@@ -366,6 +368,8 @@ namespace sw
             }
             else if (rOneLR != rTwoLR)
                 bPlausableTitlePage = false;
+            else if (rFirstFrmSize != rFollowFrmSize)
+                bPlausableTitlePage = false;
             else
             {
                 HdFtDistanceGlue aOne(rTitleFmt.GetAttrSet());

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits