[Libreoffice-commits] .: sw/source

[Miklos Vajna]

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

New commits:
commit 3de25305a8a495fb63012d36f86461ce003bb5ef
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Thu Jul 5 18:29:54 2012 +0200

    sw: SwLayHelper should not consider the page after first page a first page
    
    Change-Id: Ic82dc11cca65692e221f49d43adb8b72a07aec7d

diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 06cde2f..a05572a 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -60,6 +60,7 @@
 //
 #include <pam.hxx>
 #include <docsh.hxx>
+#include <poolfmt.hxx>
 #include <com/sun/star/document/XDocumentInfoSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
@@ -651,7 +652,11 @@ sal_Bool SwLayHelper::CheckInsertPage()
             bNextPageOdd = !bNextPageOdd;
             bInsertEmpty = sal_True;
         }
+        // If the page style is changing, we'll have a first page.
         bool bNextPageFirst = pDesc != rpPage->GetPageDesc();
+        // Considering the page after the first page would be confusing.
+        if (rpPage->GetPageDesc() == pDoc->GetPageDescFromPool(RES_POOLPAGE_FIRST))
+            bNextPageFirst = false;
         ::InsertNewPage( (SwPageDesc&)*pDesc, rpPage->GetUpper(),
                          bNextPageOdd, bNextPageFirst, bInsertEmpty, sal_False, rpPage->GetNext() );
         if ( bEnd )