[Libreoffice-commits] .: sw/source

[Miklos Vajna]

 sw/source/core/layout/laycache.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 40faf88cf0bef76e653e7e9dab707b4c936e7a3e
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Thu Jul 5 17:04:08 2012 +0200

    SwLayHelper: when the page style name changes, we have a first page
    
    Previously we only considered the first page of the whole document as
    first page, which was incorrect.
    
    Change-Id: I2e37fe504a5baee986d63d0cdef166f836877174

diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 8416c89..06cde2f 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -651,8 +651,9 @@ sal_Bool SwLayHelper::CheckInsertPage()
             bNextPageOdd = !bNextPageOdd;
             bInsertEmpty = sal_True;
         }
+        bool bNextPageFirst = pDesc != rpPage->GetPageDesc();
         ::InsertNewPage( (SwPageDesc&)*pDesc, rpPage->GetUpper(),
-                         bNextPageOdd, nPgNum == 1, bInsertEmpty, sal_False, rpPage->GetNext() );
+                         bNextPageOdd, bNextPageFirst, bInsertEmpty, sal_False, rpPage->GetNext() );
         if ( bEnd )
         {
             OSL_ENSURE( rpPage->GetNext(), "No new page?" );