diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-05 18:29:54 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-05 18:30:38 +0200 |
| commit | 3de25305a8a495fb63012d36f86461ce003bb5ef (patch) | |
| tree | cd6f2dcdbf219a2dbf4176fa262d8d99c5c4101a /sw | |
| parent | ce1c1e84b3dbcc09de632def57a34099cb63b884 (diff) | |
sw: SwLayHelper should not consider the page after first page a first page
Change-Id: Ic82dc11cca65692e221f49d43adb8b72a07aec7d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/laycache.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 06cde2f6bb4a..a05572af77af 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 ) |